diff --git a/.gitignore b/.gitignore
index 11f30132..4fce95e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@ node_modules/
 # Files
 *.sublime-project
 *.sublime-workspace
+package-lock.json
 
 .DS_Store
diff --git a/README.md b/README.md
index 030d8c94..b0f388ed 100755
--- a/README.md
+++ b/README.md
@@ -11,10 +11,10 @@ You can also manually activate this theme by adding these lines to your user set
 ### Theme options
 
 ```json
-"matilde_theme_big_fileicons": true,
-"matilde_theme_compact_sidebar": true,
-"matilde_theme_contrast_mode": false,
-"matilde_theme_small_statusbar": true,
-"matilde_theme_contrast_mode": true,
-"matilde_theme_titlebar": false,
+"mariana_theme_big_fileicons": true,
+"mariana_theme_compact_sidebar": true,
+"mariana_theme_contrast_mode": false,
+"mariana_theme_small_statusbar": true,
+"mariana_theme_contrast_mode": true,
+"mariana_theme_titlebar": false,
 ```
diff --git a/gulpfile.js b/gulpfile.js
index 49f71b53..4d997b2d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,29 +1,67 @@
 const path = require('path');
 const fs = require('fs');
 const gulp = require('gulp');
-const array = [];
-let object = {};
 
-const build = function() {
-    console.log("Start Build Matilde Theme");
+function theme(name) {
+    const merge = [];
+    let options = {};
+    console.log('===============================================================================');
+    console.log("▶️  - Start Theme Build.");
+    console.log('===============================================================================');
 
     fs.readdirSync('./src/themes/').forEach(file => {
+        console.log(`👁  - Reading ${file} file.`);
         file = path.join(__dirname, '/src/themes/' + file);
         fs.readFile(file, 'utf8', (err, data) => {
             if (err) throw err;
-            object = JSON.parse(data);
-            Object.keys(object).map((objectKey) => {
-                var value = object[objectKey];
-                array.push(value);
+            options = JSON.parse(data);
+            Object.keys(options).map((optionsKey) => {
+                var value = options[optionsKey];
+                merge.push(value);
             });
-            fs.writeFile("Matilde-Theme.sublime-theme", JSON.stringify(array, null, 4), (err) => {
+            fs.writeFile(`${name}.sublime-theme`, JSON.stringify(merge, null, 4), (err) => {
                 if (err) {
+                    console.log('===============================================================================');
+                    console.log(`🆘 - Problme with ${name}.`);
                     console.log(err);
+                    console.log('===============================================================================');
                 }
-                console.log("The file was saved!");
             });
         });
     });
+    console.log('===============================================================================');
+    console.log(`✅ - Theme: ${name} was saved!`);
+    console.log('===============================================================================');
+}
+
+function scheme(name) {
+    console.log('===============================================================================');
+    console.log("▶️  - Start Scheme Build.");
+    console.log('===============================================================================');
+
+    fs.readdirSync('./src/scheme/').forEach(file => {
+        console.log(`👁  - Reading ${file} file.`);
+        file = path.join(__dirname, '/src/scheme/' + file);
+        fs.readFile(file, 'utf8', (err, data) => {
+            if (err) throw err;
+            fs.writeFile(`${name}.sublime-color-scheme`, data, (err) => {
+                if (err) {
+                    console.log('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx');
+                    console.log(`🆘 - Problme with ${name}.`);
+                    console.log(err);
+                    console.log('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx');
+                }
+            });
+        });
+    });
+    console.log('===============================================================================');
+    console.log(`✅ - Scheme: ${name} was saved!`);
+    console.log('===============================================================================');
+}
+
+const build = () => {
+    scheme('Mariana-Theme');
+    theme('Mariana-Theme');
 };
 
 gulp.task("default", build);
diff --git a/package-lock.json b/package-lock.json
index 62924d07..2d8c03c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "matilde-theme-sublime",
+  "name": "mariana-theme-sublime",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
diff --git a/package.json b/package.json
index 4df24f6c..e9c45151 100755
--- a/package.json
+++ b/package.json
@@ -1,14 +1,13 @@
 {
-  "name": "matilde-theme-sublime",
+  "name": "mariana-theme-sublime",
   "version": "1.0.0",
-  "description": "Matilde Theme for Sublime Text 3",
+  "description": "Mariana Theme for Sublime Text 3",
   "scripts": {
     "build": "gulp",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [
-    "sublime-text",
-    "material-theme"
+    "sublime-text"
   ],
   "author": "Mauro Reis Vieira <mauroreisvieira@gmail.com>",
   "license": "MIT",
diff --git a/src/themes/01-other.json b/src/themes/01-other.json
index 968e11c7..9ec938a7 100644
--- a/src/themes/01-other.json
+++ b/src/themes/01-other.json
@@ -26,10 +26,10 @@
     },
     {
         "class": "fold_button_control",
-        "layer0.texture": "matilde-theme-sublime/assets/default/fold_right.png",
+        "layer0.texture": "mariana-theme/assets/default/fold_right.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": 0,
-        "layer1.texture": "matilde-theme-sublime/assets/commons/fold_right--hover.png",
+        "layer1.texture": "mariana-theme/assets/commons/fold_right--hover.png",
         "layer1.opacity": 0.0,
         "layer1.inner_margin": 0,
         "content_margin": [9, 7, 8, 6]
@@ -43,8 +43,8 @@
     {
         "class": "fold_button_control",
         "attributes": ["expanded"],
-        "layer0.texture": "matilde-theme-sublime/assets/default/fold_down.png",
-        "layer1.texture": "matilde-theme-sublime/assets/commons/fold_down--hover.png"
+        "layer0.texture": "mariana-theme/assets/default/fold_down.png",
+        "layer1.texture": "mariana-theme/assets/commons/fold_down--hover.png"
     },
     {
         "class": "popup_control",
@@ -88,20 +88,20 @@
     },
     {
         "class": "overlay_control",
-        "layer0.texture": "matilde-theme-sublime/assets/default/overlay-bg.png",
+        "layer0.texture": "mariana-theme/assets/default/overlay-bg.png",
         "layer0.inner_margin": [24, 4, 24, 33],
         "layer0.opacity": 1.0,
-        "layer1.texture": "matilde-theme-sublime/assets/commons/quick-panel-background.png",
+        "layer1.texture": "mariana-theme/assets/commons/quick-panel-background.png",
         "layer1.inner_margin": [16, 0, 16, 25],
         "layer1.opacity": 1.0,
         "content_margin": [13, 13, 13, 33]
     },
     {
         "class": "disclosure_button_control",
-        "layer0.texture": "matilde-theme-sublime/assets/default/folder.png",
+        "layer0.texture": "mariana-theme/assets/default/folder.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": 0,
-        "layer1.texture": "matilde-theme-sublime/assets/commons/folder--hover.png",
+        "layer1.texture": "mariana-theme/assets/commons/folder--hover.png",
         "layer1.opacity": 0.0,
         "layer1.inner_margin": 0,
         "content_margin": [0, 0, 0, 0]
@@ -118,19 +118,19 @@
     {
         "class": "disclosure_button_control",
         "attributes": ["expanded"],
-        "layer0.texture": "matilde-theme-sublime/assets/commons/folder_opened--hover.png"
+        "layer0.texture": "mariana-theme/assets/commons/folder_opened--hover.png"
     },
     {
         "class": "close_button",
         "content_margin": [8, 8],
-        "layer0.texture": "matilde-theme-sublime/assets/default/close_icon.png",
+        "layer0.texture": "mariana-theme/assets/default/close_icon.png",
         "layer0.opacity": {
             "target": 0.0,
             "speed": 7.0,
             "interpolation": "smoothstep"
         },
         "layer0.inner_margin": [0, 0],
-        "layer1.texture": "matilde-theme-sublime/assets/commons/close_icon--hover.png",
+        "layer1.texture": "mariana-theme/assets/commons/close_icon--hover.png",
         "layer1.opacity": 0,
         "layer1.inner_margin": [0, 0]
     },
@@ -140,7 +140,7 @@
             "class": "tree_row",
             "attributes": ["hover"]
         }],
-        "layer0.texture": "matilde-theme-sublime/assets/default/close_icon.png",
+        "layer0.texture": "mariana-theme/assets/default/close_icon.png",
         "layer0.opacity": {
             "target": 1.0,
             "speed": 7.0,
@@ -151,7 +151,7 @@
     {
         "class": "close_button",
         "attributes": ["dirty"],
-        "layer0.texture": "matilde-theme-sublime/assets/commons/dirty_icon--hover.png",
+        "layer0.texture": "mariana-theme/assets/commons/dirty_icon--hover.png",
         "layer0.opacity": 1.0
     },
     {
@@ -165,7 +165,7 @@
         "layer0.tint": [38, 50, 56],
         "layer0.inner_margin": [0, 6],
         "layer0.opacity": 1.0,
-        "layer1.texture": "matilde-theme-sublime/assets/default/normal_bar_vertical.png",
+        "layer1.texture": "mariana-theme/assets/default/normal_bar_vertical.png",
         "layer1.opacity": 1.0,
         "layer1.inner_margin": [0, 6],
         "blur": false
@@ -176,14 +176,14 @@
         "layer0.tint": [38, 50, 56],
         "layer0.inner_margin": [0, 6],
         "layer0.opacity": 1.0,
-        "layer1.texture": "matilde-theme-sublime/assets/default/normal_bar_horizontal.png",
+        "layer1.texture": "mariana-theme/assets/default/normal_bar_horizontal.png",
         "layer1.opacity": 1.0,
         "layer1.inner_margin": [6, 0],
         "blur": false
     },
     {
         "class": "scroll_corner_control",
-        "layer0.texture": "matilde-theme-sublime/assets/default/normal_bar_corner.png",
+        "layer0.texture": "mariana-theme/assets/default/normal_bar_corner.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": [1, 1]
     },
@@ -192,7 +192,7 @@
         "layer0.tint": [38, 50, 255, 255],
         "layer0.opacity": 1.0,
         "layer0.inner_margin": [10, 10],
-        "layer1.texture": "matilde-theme-sublime/assets/default/thumb_vertical.png",
+        "layer1.texture": "mariana-theme/assets/default/thumb_vertical.png",
         "layer1.opacity": 1.0,
         "layer1.inner_margin": [8, 8],
         "content_margin": [6, 16],
@@ -201,7 +201,7 @@
     {
         "class": "puck_control",
         "attributes": ["horizontal"],
-        "layer0.texture": "matilde-theme-sublime/assets/default/thumb_horizontal.png",
+        "layer0.texture": "mariana-theme/assets/default/thumb_horizontal.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": [10, 0],
         "content_margin": [16, 6],
@@ -236,7 +236,7 @@
     {
         "class": "scroll_bar_control",
         "settings": ["overlay_scroll_bars"],
-        "layer0.texture": "matilde-theme-sublime/assets/default/normal_bar_vertical.png",
+        "layer0.texture": "mariana-theme/assets/default/normal_bar_vertical.png",
         "layer0.inner_margin": [0, 5],
         "blur": true
     },
@@ -244,10 +244,10 @@
         "class": "scroll_bar_control",
         "settings": ["overlay_scroll_bars"],
         "attributes": ["horizontal"],
-        "layer0.texture": "matilde-theme-sublime/assets/default/normal_bar_horizontal.png",
+        "layer0.texture": "mariana-theme/assets/default/normal_bar_horizontal.png",
         "layer0.inner_margin": [5, 0],
         "layer0.opacity": 0.0,
-        "layer1.texture": "matilde-theme-sublime/assets/default/normal_bar_horizontal.png",
+        "layer1.texture": "mariana-theme/assets/default/normal_bar_horizontal.png",
         "layer1.inner_margin": [5, 0],
         "layer1.opacity": 0.0,
         "blur": true
@@ -257,7 +257,7 @@
         "layer0.tint": [38, 50, 56],
         "layer0.opacity": 0.0,
         "layer0.inner_margin": [1, 8, 1, 8],
-        "layer1.texture": "matilde-theme-sublime/assets/default/thumb_vertical.png",
+        "layer1.texture": "mariana-theme/assets/default/thumb_vertical.png",
         "layer1.inner_margin": [1, 8, 1, 8],
         "content_margin": [6, 16],
         "blur": true
@@ -268,7 +268,7 @@
         "layer0.tint": [38, 50, 56],
         "layer0.opacity": 0.0,
         "layer0.inner_margin": [8, 1, 8, 1],
-        "layer1.texture": "matilde-theme-sublime/assets/default/thumb_horizontal.png",
+        "layer1.texture": "mariana-theme/assets/default/thumb_horizontal.png",
         "layer1.inner_margin": [8, 1, 8, 1],
         "content_margin": [16, 6],
         "blur": true
@@ -308,14 +308,14 @@
     },
     {
         "class": "panel_button_control",
-        "layer0.texture": "matilde-theme-sublime/assets/default/overflow_menu.png",
+        "layer0.texture": "mariana-theme/assets/default/overflow_menu.png",
         "layer0.opacity": 1.0,
         "content_margin": [10, 10]
     },
     {
         "class": "panel_button_control",
         "attributes": ["hover"],
-        "layer0.texture": "matilde-theme-sublime/assets/commons/overflow_menu--hover.png"
+        "layer0.texture": "mariana-theme/assets/commons/overflow_menu--hover.png"
     },
     {
         "class": "panel_control",
@@ -329,9 +329,9 @@
     },
     {
         "class": "panel_close_button",
-        "layer0.texture": "matilde-theme-sublime/assets/default/close_icon.png",
+        "layer0.texture": "mariana-theme/assets/default/close_icon.png",
         "layer0.opacity": 0.6,
-        "layer1.texture": "matilde-theme-sublime/assets/commons/close_icon--hover.png",
+        "layer1.texture": "mariana-theme/assets/commons/close_icon--hover.png",
         "layer1.opacity": 0.0,
         "content_margin": [0, 0]
     },
@@ -343,7 +343,7 @@
     },
     {
         "class": "text_line_control",
-        "layer0.texture": "matilde-theme-sublime/assets/default/input_field_border.png",
+        "layer0.texture": "mariana-theme/assets/default/input_field_border.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": [20, 5, 20, 5],
         "tint_index": 1,
@@ -355,7 +355,7 @@
         "parents": [{
             "class": "overlay_control"
         }],
-        "layer0.texture": "matilde-theme-sublime/assets/default/input_field_border--short.png",
+        "layer0.texture": "mariana-theme/assets/default/input_field_border--short.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": [32, 0, 32, 2],
         "layer0.draw_center": true,
@@ -365,10 +365,10 @@
     {
         "class": "dropdown_button_control",
         "content_margin": [12, 12],
-        "layer0.texture": "matilde-theme-sublime/assets/default/overflow_menu.png",
+        "layer0.texture": "mariana-theme/assets/default/overflow_menu.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": [0, 0],
-        "layer1.texture": "matilde-theme-sublime/assets/commons/overflow_menu--hover.png",
+        "layer1.texture": "mariana-theme/assets/commons/overflow_menu--hover.png",
         "layer1.opacity": 0.0,
         "layer1.inner_margin": [0, 0]
     },
@@ -400,10 +400,10 @@
         "layer0.tint": [38, 50, 56],
         "layer0.opacity": 0.0,
         "layer0.inner_margin": [6, 6],
-        "layer1.texture": "matilde-theme-sublime/assets/commons/full_button_indented.png",
+        "layer1.texture": "mariana-theme/assets/commons/full_button_indented.png",
         "layer1.opacity": 0.0,
         "layer1.inner_margin": [6, 6],
-        "layer2.texture": "matilde-theme-sublime/assets/default/blue_highlight.png",
+        "layer2.texture": "mariana-theme/assets/default/blue_highlight.png",
         "layer2.opacity": {
             "target": 0.0,
             "speed": 5.0,
diff --git a/src/themes/03-icon_file.json b/src/themes/03-icon_file.json
index 4c8cd4ae..b11a99e3 100644
--- a/src/themes/03-icon_file.json
+++ b/src/themes/03-icon_file.json
@@ -33,22 +33,22 @@
         "content_margin": [11, 7],
         "layer0.tint": [38, 50, 56],
         "layer0.opacity": 0,
-        "layer1.texture": "matilde-theme-sublime/assets/default/folder.png",
+        "layer1.texture": "mariana-theme/assets/default/folder.png",
         "layer1.opacity": 1.0,
-        "layer2.texture": "matilde-theme-sublime/assets/commons/folder--hover.png",
+        "layer2.texture": "mariana-theme/assets/commons/folder--hover.png",
         "layer2.opacity": 0.0,
-        "layer3.texture": "matilde-theme-sublime/assets/commons/folder_opened--hover.png",
+        "layer3.texture": "mariana-theme/assets/commons/folder_opened--hover.png",
         "layer3.opacity": 0.0
     },
     {
         "class": "icon_folder",
-        "settings": ["matilde_theme_arrow_folders"],
+        "settings": ["mariana_theme_arrow_folders"],
         "layer0.opacity": 0,
-        "layer1.texture": "matilde-theme-sublime/assets/default/arrow_folder.png",
+        "layer1.texture": "mariana-theme/assets/default/arrow_folder.png",
         "layer1.opacity": 1,
-        "layer2.texture": "matilde-theme-sublime/assets/commons/arrow_folder--hover.png",
+        "layer2.texture": "mariana-theme/assets/commons/arrow_folder--hover.png",
         "layer2.opacity": 0.0,
-        "layer3.texture": "matilde-theme-sublime/assets/commons/arrow_folder--opened.png",
+        "layer3.texture": "mariana-theme/assets/commons/arrow_folder--opened.png",
         "layer3.opacity": 0.0
     },
 
@@ -82,19 +82,19 @@
         }],
         "layer3.texture": {
             "keyframes": [
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-0.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-1.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-2.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-3.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-4.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-5.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-5.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-5.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-6.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-6.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-6.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-6.png",
-                "matilde-theme-sublime/assets/commons/folder_opened--hover-7.png"
+                "mariana-theme/assets/commons/folder_opened--hover-0.png",
+                "mariana-theme/assets/commons/folder_opened--hover-1.png",
+                "mariana-theme/assets/commons/folder_opened--hover-2.png",
+                "mariana-theme/assets/commons/folder_opened--hover-3.png",
+                "mariana-theme/assets/commons/folder_opened--hover-4.png",
+                "mariana-theme/assets/commons/folder_opened--hover-5.png",
+                "mariana-theme/assets/commons/folder_opened--hover-5.png",
+                "mariana-theme/assets/commons/folder_opened--hover-5.png",
+                "mariana-theme/assets/commons/folder_opened--hover-6.png",
+                "mariana-theme/assets/commons/folder_opened--hover-6.png",
+                "mariana-theme/assets/commons/folder_opened--hover-6.png",
+                "mariana-theme/assets/commons/folder_opened--hover-6.png",
+                "mariana-theme/assets/commons/folder_opened--hover-7.png"
             ],
             "loop": false,
             "frame_time": 0.020
@@ -108,12 +108,12 @@
 
     {
         "class": "icon_folder",
-        "settings": ["matilde_theme_arrow_folders"],
+        "settings": ["mariana_theme_arrow_folders"],
         "parents": [{
             "class": "tree_row",
             "attributes": ["expanded", "hover"]
         }],
-        "layer3.texture": "matilde-theme-sublime/assets/commons/arrow_folder--opened.png"
+        "layer3.texture": "mariana-theme/assets/commons/arrow_folder--opened.png"
     },
 
     {
@@ -122,7 +122,7 @@
             "class": "tree_row",
             "attributes": ["selected"]
         }],
-        "layer1.texture": "matilde-theme-sublime/assets/commons/folder--hover.png"
+        "layer1.texture": "mariana-theme/assets/commons/folder--hover.png"
     },
 
 
@@ -131,18 +131,18 @@
         "class": "icon_folder_loading",
         "layer0.texture": {
             "keyframes": [
-                "matilde-theme-sublime/assets/commons/spinner11.png",
-                "matilde-theme-sublime/assets/commons/spinner10.png",
-                "matilde-theme-sublime/assets/commons/spinner9.png",
-                "matilde-theme-sublime/assets/commons/spinner8.png",
-                "matilde-theme-sublime/assets/commons/spinner7.png",
-                "matilde-theme-sublime/assets/commons/spinner6.png",
-                "matilde-theme-sublime/assets/commons/spinner5.png",
-                "matilde-theme-sublime/assets/commons/spinner4.png",
-                "matilde-theme-sublime/assets/commons/spinner3.png",
-                "matilde-theme-sublime/assets/commons/spinner2.png",
-                "matilde-theme-sublime/assets/commons/spinner1.png",
-                "matilde-theme-sublime/assets/commons/spinner.png"
+                "mariana-theme/assets/commons/spinner11.png",
+                "mariana-theme/assets/commons/spinner10.png",
+                "mariana-theme/assets/commons/spinner9.png",
+                "mariana-theme/assets/commons/spinner8.png",
+                "mariana-theme/assets/commons/spinner7.png",
+                "mariana-theme/assets/commons/spinner6.png",
+                "mariana-theme/assets/commons/spinner5.png",
+                "mariana-theme/assets/commons/spinner4.png",
+                "mariana-theme/assets/commons/spinner3.png",
+                "mariana-theme/assets/commons/spinner2.png",
+                "mariana-theme/assets/commons/spinner1.png",
+                "mariana-theme/assets/commons/spinner.png"
             ],
             "loop": true,
             "frame_time": 0.075
@@ -156,7 +156,7 @@
 
     {
         "class": "icon_folder_dup",
-        "layer0.texture": "matilde-theme-sublime/assets/default/folder_dup.png",
+        "layer0.texture": "mariana-theme/assets/default/folder_dup.png",
         "layer0.opacity": 1.0,
         "content_margin": [11, 7]
     },
@@ -167,7 +167,7 @@
             "class": "tree_row",
             "attributes": ["hover"]
         }],
-        "layer0.texture": "matilde-theme-sublime/assets/commons/folder_dup--hover.png"
+        "layer0.texture": "mariana-theme/assets/commons/folder_dup--hover.png"
     },
 
     {
@@ -176,18 +176,18 @@
             "class": "tree_row",
             "attributes": ["expanded"]
         }],
-        "layer0.texture": "matilde-theme-sublime/assets/commons/folder_dup--hover.png"
+        "layer0.texture": "mariana-theme/assets/commons/folder_dup--hover.png"
     },
 
     {
         "class": "icon_context",
-        "layer0.texture": "matilde-theme-sublime/assets/commons/find_context--hover.png",
+        "layer0.texture": "mariana-theme/assets/commons/find_context--hover.png",
         "layer0.opacity": {
             "target": 0.0,
             "speed": 6.0,
             "interpolation": "smoothstep"
         },
-        "layer1.texture": "matilde-theme-sublime/assets/default/find_context.png",
+        "layer1.texture": "mariana-theme/assets/default/find_context.png",
         "layer1.opacity": {
             "target": 1.0,
             "speed": 6.0,
@@ -216,13 +216,13 @@
     },
     {
         "class": "icon_use_buffer",
-        "layer0.texture": "matilde-theme-sublime/assets/commons/use_buffer--hover.png",
+        "layer0.texture": "mariana-theme/assets/commons/use_buffer--hover.png",
         "layer0.opacity": {
             "target": 0.0,
             "speed": 6.0,
             "interpolation": "smoothstep"
         },
-        "layer1.texture": "matilde-theme-sublime/assets/default/use_buffer.png",
+        "layer1.texture": "mariana-theme/assets/default/use_buffer.png",
         "layer1.opacity": {
             "target": 1.0,
             "speed": 6.0,
@@ -249,13 +249,13 @@
     },
     {
         "class": "icon_reverse",
-        "layer0.texture": "matilde-theme-sublime/assets/commons/find_reverse--hover.png",
+        "layer0.texture": "mariana-theme/assets/commons/find_reverse--hover.png",
         "layer0.opacity": {
             "target": 0.0,
             "speed": 6.0,
             "interpolation": "smoothstep"
         },
-        "layer1.texture": "matilde-theme-sublime/assets/default/find_reverse.png",
+        "layer1.texture": "mariana-theme/assets/default/find_reverse.png",
         "layer1.opacity": {
             "target": 1.0,
             "speed": 6.0,
@@ -297,13 +297,13 @@
     },
     {
         "class": "icon_regex",
-        "layer0.texture": "matilde-theme-sublime/assets/commons/find_regex--hover.png",
+        "layer0.texture": "mariana-theme/assets/commons/find_regex--hover.png",
         "layer0.opacity": {
             "target": 0.0,
             "speed": 6.0,
             "interpolation": "smoothstep"
         },
-        "layer1.texture": "matilde-theme-sublime/assets/default/find_regex.png",
+        "layer1.texture": "mariana-theme/assets/default/find_regex.png",
         "layer1.opacity": {
             "target": 1.0,
             "speed": 6.0,
@@ -333,13 +333,13 @@
 
     {
         "class": "icon_case",
-        "layer0.texture": "matilde-theme-sublime/assets/commons/find_case--hover.png",
+        "layer0.texture": "mariana-theme/assets/commons/find_case--hover.png",
         "layer0.opacity": {
             "target": 0.0,
             "speed": 6.0,
             "interpolation": "smoothstep"
         },
-        "layer1.texture": "matilde-theme-sublime/assets/default/find_case.png",
+        "layer1.texture": "mariana-theme/assets/default/find_case.png",
         "layer1.opacity": {
             "target": 1.0,
             "speed": 6.0,
@@ -370,13 +370,13 @@
 
     {
         "class": "icon_whole_word",
-        "layer0.texture": "matilde-theme-sublime/assets/commons/find_word--hover.png",
+        "layer0.texture": "mariana-theme/assets/commons/find_word--hover.png",
         "layer0.opacity": {
             "target": 0.0,
             "speed": 6.0,
             "interpolation": "smoothstep"
         },
-        "layer1.texture": "matilde-theme-sublime/assets/default/find_word.png",
+        "layer1.texture": "mariana-theme/assets/default/find_word.png",
         "layer1.opacity": {
             "target": 1.0,
             "speed": 6.0,
@@ -408,13 +408,13 @@
 
     {
         "class": "icon_wrap",
-        "layer0.texture": "matilde-theme-sublime/assets/commons/find_wrap--hover.png",
+        "layer0.texture": "mariana-theme/assets/commons/find_wrap--hover.png",
         "layer0.opacity": {
             "target": 0.0,
             "speed": 6.0,
             "interpolation": "smoothstep"
         },
-        "layer1.texture": "matilde-theme-sublime/assets/default/find_wrap.png",
+        "layer1.texture": "mariana-theme/assets/default/find_wrap.png",
         "layer1.opacity": {
             "target": 1.0,
             "speed": 6.0,
@@ -445,13 +445,13 @@
 
     {
         "class": "icon_in_selection",
-        "layer0.texture": "matilde-theme-sublime/assets/commons/find_inselection--hover.png",
+        "layer0.texture": "mariana-theme/assets/commons/find_inselection--hover.png",
         "layer0.opacity": {
             "target": 0.0,
             "speed": 6.0,
             "interpolation": "smoothstep"
         },
-        "layer1.texture": "matilde-theme-sublime/assets/default/find_inselection.png",
+        "layer1.texture": "mariana-theme/assets/default/find_inselection.png",
         "layer1.opacity": {
             "target": 1.0,
             "speed": 6.0,
@@ -483,13 +483,13 @@
 
     {
         "class": "icon_highlight",
-        "layer0.texture": "matilde-theme-sublime/assets/commons/find_highlight--hover.png",
+        "layer0.texture": "mariana-theme/assets/commons/find_highlight--hover.png",
         "layer0.opacity": {
             "target": 0.0,
             "speed": 6.0,
             "interpolation": "smoothstep"
         },
-        "layer1.texture": "matilde-theme-sublime/assets/default/find_highlight.png",
+        "layer1.texture": "mariana-theme/assets/default/find_highlight.png",
         "layer1.opacity": {
             "target": 1.0,
             "speed": 6.0,
@@ -520,13 +520,13 @@
 
     {
         "class": "icon_preserve_case",
-        "layer0.texture": "matilde-theme-sublime/assets/commons/replace_preserve_case--hover.png",
+        "layer0.texture": "mariana-theme/assets/commons/replace_preserve_case--hover.png",
         "layer0.opacity": {
             "target": 0.0,
             "speed": 6.0,
             "interpolation": "smoothstep"
         },
-        "layer1.texture": "matilde-theme-sublime/assets/default/replace_preserve_case.png",
+        "layer1.texture": "mariana-theme/assets/default/replace_preserve_case.png",
         "layer1.opacity": {
             "target": 1.0,
             "speed": 6.0,
diff --git a/src/themes/05-tree_row.json b/src/themes/05-tree_row.json
index b4abfa93..cc12edb0 100644
--- a/src/themes/05-tree_row.json
+++ b/src/themes/05-tree_row.json
@@ -1,7 +1,7 @@
 [
     {
         "class": "tree_row",
-        "layer1.texture": "matilde-theme-sublime/assets/commons/tree_highlight.png",
+        "layer1.texture": "mariana-theme/assets/commons/tree_highlight.png",
         "layer1.opacity": {
             "target": 0.0,
             "speed": 5.0,
@@ -20,9 +20,9 @@
     },
     {
         "class": "tree_row",
-        "settings": ["matilde_theme_bullet_tree_indicator"],
+        "settings": ["mariana_theme_bullet_tree_indicator"],
         "attributes": ["selected"],
-        "layer1.texture": "matilde-theme-sublime/assets/commons/tree_highlight--bullet.png",
+        "layer1.texture": "mariana-theme/assets/commons/tree_highlight--bullet.png",
         "layer1.inner_margin": [22, 16, 0, 0]
     },
     {
diff --git a/src/themes/08-tab_control.json b/src/themes/08-tab_control.json
index 32bb7bfb..0948b064 100644
--- a/src/themes/08-tab_control.json
+++ b/src/themes/08-tab_control.json
@@ -23,7 +23,7 @@
         "layer0.inner_margin": [24, 0],
         "layer0.opacity": 1.0,
         "tint_index": 0,
-        "layer1.texture": "matilde-theme-sublime/assets/default/tab_current.png",
+        "layer1.texture": "mariana-theme/assets/default/tab_current.png",
         "layer1.inner_margin": [0, 0],
         "layer1.opacity": 0.0,
         "layer2.tint": [128, 203, 196, 0],
@@ -97,18 +97,18 @@
     {
         "class": "tab_close_button",
         "content_margin": [0, 0],
-        "layer0.texture": "matilde-theme-sublime/assets/default/close_icon.png",
+        "layer0.texture": "mariana-theme/assets/default/close_icon.png",
         "layer0.opacity": 1,
         "layer0.inner_margin": 0,
-        "layer1.texture": "matilde-theme-sublime/assets/commons/close_icon--hover.png",
+        "layer1.texture": "mariana-theme/assets/commons/close_icon--hover.png",
         "layer1.opacity": {
             "target": 0.0,
             "speed": 5.0,
             "interpolation": "smoothstep"
         },
-        "layer2.texture": "matilde-theme-sublime/assets/default/dirty_icon.png",
+        "layer2.texture": "mariana-theme/assets/default/dirty_icon.png",
         "layer2.inner_margin": 0,
-        "layer3.texture": "matilde-theme-sublime/assets/commons/dirty_icon--hover.png",
+        "layer3.texture": "mariana-theme/assets/commons/dirty_icon--hover.png",
         "layer3.opacity": {
             "target": 0.0,
             "speed": 5.0,
@@ -191,10 +191,10 @@
     {
         "class": "scroll_tabs_left_button",
         "content_margin": [14, 7],
-        "layer0.texture": "matilde-theme-sublime/assets/default/arrow_left.png",
+        "layer0.texture": "mariana-theme/assets/default/arrow_left.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": 0,
-        "layer1.texture": "matilde-theme-sublime/assets/commons/arrow_left--hover.png",
+        "layer1.texture": "mariana-theme/assets/commons/arrow_left--hover.png",
         "layer1.opacity": {
             "target": 0.0,
             "speed": 8.0,
@@ -216,10 +216,10 @@
     {
         "class": "scroll_tabs_right_button",
         "content_margin": [14, 7],
-        "layer0.texture": "matilde-theme-sublime/assets/default/arrow_right.png",
+        "layer0.texture": "mariana-theme/assets/default/arrow_right.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": 0,
-        "layer1.texture": "matilde-theme-sublime/assets/commons/arrow_right--hover.png",
+        "layer1.texture": "mariana-theme/assets/commons/arrow_right--hover.png",
         "layer1.opacity": {
             "target": 0.0,
             "speed": 8.0,
@@ -241,10 +241,10 @@
     {
         "class": "show_tabs_dropdown_button",
         "content_margin": [12, 12],
-        "layer0.texture": "matilde-theme-sublime/assets/default/overflow_menu.png",
+        "layer0.texture": "mariana-theme/assets/default/overflow_menu.png",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": 0,
-        "layer1.texture": "matilde-theme-sublime/assets/commons/overflow_menu--hover.png",
+        "layer1.texture": "mariana-theme/assets/commons/overflow_menu--hover.png",
         "layer1.opacity": {
             "target": 0.0,
             "speed": 8.0,
diff --git a/src/themes/09-overwrite.json b/src/themes/09-overwrite.json
index a5ece498..91d0a6bc 100644
--- a/src/themes/09-overwrite.json
+++ b/src/themes/09-overwrite.json
@@ -1,61 +1,61 @@
 [
     {
         "class": "status_container",
-        "settings": ["matilde_theme_small_statusbar"],
+        "settings": ["mariana_theme_small_statusbar"],
         "content_margin": [12, 6, 12, 6]
     },
     {
         "class": "tree_row",
-        "settings": ["matilde_theme_disable_tree_indicator"],
+        "settings": ["mariana_theme_disable_tree_indicator"],
         "attributes": ["selected"],
         "layer1.opacity": 0.0
     },
     {
         "class": "panel_control",
-        "settings": ["matilde_theme_panel_separator"],
-        "layer1.texture": "matilde-theme-sublime/assets/commons/panel_separator.png",
+        "settings": ["mariana_theme_panel_separator"],
+        "layer1.texture": "mariana-theme/assets/commons/panel_separator.png",
         "layer1.opacity": 0.2,
         "layer1.inner_margin": [2, 2, 2, 2]
     },
     {
         "class": "sidebar_container",
-        "settings": ["matilde_theme_contrast_mode"],
+        "settings": ["mariana_theme_contrast_mode"],
         "layer1.opacity": 0.2
     },
     {
         "class": "sidebar_tree",
-        "settings": ["matilde_theme_contrast_mode"],
+        "settings": ["mariana_theme_contrast_mode"],
         "layer1.opacity": 0.2
     },
     {
         "class": "status_bar",
-        "settings": ["matilde_theme_contrast_mode"]
+        "settings": ["mariana_theme_contrast_mode"]
     },
 
     {
         "class": "sidebar_tree",
-        "settings": ["matilde_theme_compact_sidebar"],
+        "settings": ["mariana_theme_compact_sidebar"],
         "row_padding": [24, 5]
     },
     {
         "class": "panel_control",
-        "settings": ["matilde_theme_compact_panel"],
+        "settings": ["mariana_theme_compact_panel"],
         "content_margin": [0, 0, 0, 0]
     },
     {
         "class": "icon_file_type",
-        "settings": ["matilde_theme_disable_fileicons"],
+        "settings": ["mariana_theme_disable_fileicons"],
         "layer0.opacity": 0,
         "content_margin": [0, 0]
     },
     {
         "class": "icon_file_type",
-        "settings": ["matilde_theme_big_fileicons"],
+        "settings": ["mariana_theme_big_fileicons"],
         "content_margin": [11, 11]
     },
     {
         "class": "icon_file_type",
-        "settings": ["matilde_theme_big_fileicons"],
+        "settings": ["mariana_theme_big_fileicons"],
         "parents": [{
             "class": "tree_row",
             "attributes": ["selected"]
@@ -64,21 +64,21 @@
     },
     {
         "class": "puck_control",
-        "settings": ["matilde_theme_bright_scrollbars"],
-        "layer1.texture": "matilde-theme-sublime/assets/commons/thumb_vertical.png",
+        "settings": ["mariana_theme_bright_scrollbars"],
+        "layer1.texture": "mariana-theme/assets/commons/thumb_vertical.png",
         "layer1.opacity": 0.2
     },
 
     {
         "class": "puck_control",
         "attributes": ["horizontal"],
-        "settings": ["matilde_theme_bright_scrollbars"],
-        "layer1.texture": "matilde-theme-sublime/assets/commons/thumb_horizontal.png",
+        "settings": ["mariana_theme_bright_scrollbars"],
+        "layer1.texture": "mariana-theme/assets/commons/thumb_horizontal.png",
         "layer1.opacity": 0.2
     },
     {
         "class": "title_bar",
-        "settings": ["matilde_theme_titlebar"],
+        "settings": ["mariana_theme_titlebar"],
         "platforms": ["osx"],
         "fg": [96, 125, 139],
         "bg": [24, 30, 36]