diff --git a/schemes/textmate/base16-material-theme.dark.tmTheme b/schemes/Material-Theme-Darker.tmTheme
similarity index 99%
rename from schemes/textmate/base16-material-theme.dark.tmTheme
rename to schemes/Material-Theme-Darker.tmTheme
index 7be72dbf5..bacbaa558 100644
--- a/schemes/textmate/base16-material-theme.dark.tmTheme
+++ b/schemes/Material-Theme-Darker.tmTheme
@@ -578,6 +578,6 @@
     </dict>
   </array>
   <key>uuid</key>
-  <string>567bc736-a2fa-4be3-aa1e-7fade841a344</string>
+  <string>200dce21-0a5b-4ec3-a0a1-7d9c678a60de</string>
 </dict>
 </plist>
diff --git a/schemes/textmate/base16-material-theme.default.tmTheme b/schemes/Material-Theme-Default.tmTheme
similarity index 99%
rename from schemes/textmate/base16-material-theme.default.tmTheme
rename to schemes/Material-Theme-Default.tmTheme
index 8fdf4d3aa..fc79b4e5b 100644
--- a/schemes/textmate/base16-material-theme.default.tmTheme
+++ b/schemes/Material-Theme-Default.tmTheme
@@ -560,6 +560,6 @@
     </dict>
   </array>
   <key>uuid</key>
-  <string>362ba561-a37b-4316-b940-ec2eced04308</string>
+  <string>d5cda444-7192-4959-8309-9ba2ebcb9621</string>
 </dict>
 </plist>
diff --git a/schemes/textmate/base16-material-theme.light.tmTheme b/schemes/Material-Theme-Lighter.tmTheme
similarity index 99%
rename from schemes/textmate/base16-material-theme.light.tmTheme
rename to schemes/Material-Theme-Lighter.tmTheme
index 06231202e..4bddbd1b4 100644
--- a/schemes/textmate/base16-material-theme.light.tmTheme
+++ b/schemes/Material-Theme-Lighter.tmTheme
@@ -562,6 +562,6 @@
     </dict>
   </array>
   <key>uuid</key>
-  <string>9113405b-1d1a-499c-a6a1-6d4e207f2cf0</string>
+  <string>6335f4c4-8792-4ef9-b5c4-a3fa9b912c4e</string>
 </dict>
 </plist>
diff --git a/src/schemes/palettes/material-theme-darker.yml b/src/schemes/palettes/material-theme-darker.yml
index c1c4d6162..8f95ac3ab 100755
--- a/src/schemes/palettes/material-theme-darker.yml
+++ b/src/schemes/palettes/material-theme-darker.yml
@@ -1,5 +1,18 @@
 scheme: "Material-Theme"
 author: "Mattia Astorino (http://astorinomattia.it)"
+settingsBackground: '#263238'
+settingsCaret: '#FFCC00'
+settingsFindHighlight: '#F8E71C'
+settingsForeground: '#eeffff'
+settingsGuide: '#37474F80'
+settingsGutterForeground: '#37474F'
+settingsActiveGuide: '#80CBC470'
+settingsInvisibles: '#65737e'
+settingsLineHighlight: '#00000030'
+settingsSelection: '#80CBC420'
+settingsSelectionBorder: '#516B79'
+settingsShadow: '#00000010'
+settingsStackGuide: '#37474F'
 base00: "212121"
 base01: "393939"
 base02: "515151"
diff --git a/src/schemes/palettes/material-theme.yml b/src/schemes/palettes/material-theme.yml
index 4b0d1197a..245d2c38e 100755
--- a/src/schemes/palettes/material-theme.yml
+++ b/src/schemes/palettes/material-theme.yml
@@ -1,5 +1,23 @@
+## Metadata
 scheme: "Material-Theme"
 author: "Mattia Astorino (http://astorinomattia.it)"
+
+## Settings Colors
+settingsBackground: '263238'
+settingsCaret: 'FFCC00'
+settingsFindHighlight: 'F8E71C'
+settingsForeground: 'eeffff'
+settingsGuide: '37474F80'
+settingsGutterForeground: '37474F'
+settingsActiveGuide: '80CBC470'
+settingsInvisibles: '65737e'
+settingsLineHighlight: '00000030'
+settingsSelection: '80CBC420'
+settingsSelectionBorder: '516B79'
+settingsShadow: '00000010'
+settingsStackGuide: '37474F'
+
+## Scheme Colors
 base00: "263238"
 base01: "393939"
 base02: "515151"
diff --git a/src/schemes/templates/textmate/dark.tmTheme.erb b/src/schemes/templates/textmate/Darker.tmTheme.erb
similarity index 100%
rename from src/schemes/templates/textmate/dark.tmTheme.erb
rename to src/schemes/templates/textmate/Darker.tmTheme.erb
diff --git a/src/schemes/templates/textmate/light.tmTheme.erb b/src/schemes/templates/textmate/Lighter.tmTheme.erb
similarity index 100%
rename from src/schemes/templates/textmate/light.tmTheme.erb
rename to src/schemes/templates/textmate/Lighter.tmTheme.erb
diff --git a/src/schemes/templates/textmate/default.tmTheme.erb b/src/schemes/templates/textmate/default.tmTheme.erb
index b4866530f..c3c2d2184 100755
--- a/src/schemes/templates/textmate/default.tmTheme.erb
+++ b/src/schemes/templates/textmate/default.tmTheme.erb
@@ -33,7 +33,7 @@
       <key>settings</key>
       <dict>
         <key>background</key>
-        <string>#263238</string>
+        <string>#<%= @settings["Background"]["hex"] %></string>
         <key>caret</key>
         <string>#FFCC00</string>
         <key>foreground</key>
@@ -45,7 +45,7 @@
         <key>selection</key>
         <string>#80CBC420</string>
         <key>guide</key>
-        <string>#37474F80</string>
+        <string>#<%= @settings["Guide"]["hexbgr"] %></string>
         <key>activeGuide</key>
         <string>#80CBC470</string>
         <key>stackGuide</key>