diff --git a/Makefile b/Makefile
index e9aa544..7bbdd64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SHELL = /bin/bash
 PREFIX= /usr
-THEME_DIR= $(PREFIX)/share/themes/manjaro-gdm-theme
+THEME_DIR= $(PREFIX)/share/themes/tromjaro-gdm-theme
 ICON_DIR_USER= /etc/skel
 THEME= $(wildcard theme/*.svg) \
 	   $(wildcard theme/*.png) \
diff --git a/extractgst.sh b/extractgst.sh
index a035f46..8eb7584 100755
--- a/extractgst.sh
+++ b/extractgst.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 gst=/usr/share/gnome-shell/gnome-shell-theme.gresource
-workdir=${HOME}/Github/Manjaro/manjaro-gnome-theme/gnome-shell
+workdir=${HOME}/Github/TROMjaro/tromjaro-gnome-theme/gnome-shell
 
 if [ -d $workdir ]; then
 	rm -R $workdir
diff --git a/gdm-theme-maia-install.hook b/gdm-theme-maia-install.hook
index bd269de..293f4c7 100644
--- a/gdm-theme-maia-install.hook
+++ b/gdm-theme-maia-install.hook
@@ -2,7 +2,7 @@
 Operation = Install
 Operation = Upgrade
 Type = Package
-Target = manjaro-gdm-theme
+Target = tromjaro-gdm-theme
 Target = gnome-shell
 
 [Action]
diff --git a/gdm-theme-maia-install.script b/gdm-theme-maia-install.script
index 59bb2f0..45228b1 100644
--- a/gdm-theme-maia-install.script
+++ b/gdm-theme-maia-install.script
@@ -3,7 +3,7 @@
 #Used directory
 
 gnomedir=/usr/share/gnome-shell
-themedir=/usr/share/themes/manjaro-gdm-theme
+themedir=/usr/share/themes/tromjaro-gdm-theme
 theme=gnome-shell-theme.gresource
 
 #Install & Upgrade GDM theme and icons
diff --git a/gdm-theme-maia-remove.hook b/gdm-theme-maia-remove.hook
index f5e9625..b62997a 100644
--- a/gdm-theme-maia-remove.hook
+++ b/gdm-theme-maia-remove.hook
@@ -1,7 +1,7 @@
 [Trigger]
 Operation = Remove
 Type = Package
-Target = manjaro-gdm-theme
+Target = tromjaro-gdm-theme
 
 [Action]
 Description = Remove Manjaro GDM theme
diff --git a/theme/branding.png b/theme/branding.png
index 0aa1472..2a566cf 100644
Binary files a/theme/branding.png and b/theme/branding.png differ
diff --git a/theme/gnome-shell.css b/theme/gnome-shell.css
index 9e0fd79..0426268 100644
--- a/theme/gnome-shell.css
+++ b/theme/gnome-shell.css
@@ -40,7 +40,7 @@ stage {
     color: #eeeeec;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    box-shadow: inset 0px 0px 0px 2px #16a085; }
+    box-shadow: inset 0px 0px 0px 2px #28A99D; }
   .button:hover, .message-list-clear-button.button:hover {
     color: #eeeeec;
     border-color: #1b1b1b;
@@ -91,7 +91,7 @@ stage {
     color: #eeeeec;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    box-shadow: inset 0px 0px 0px 2px #16a085; }
+    box-shadow: inset 0px 0px 0px 2px #28A99D; }
   .modal-dialog-linked-button:active, .notification-banner .notification-button:active, .hotplug-notification-item:active {
     color: #eeeeec;
     border-color: #1b1b1b;
@@ -116,7 +116,7 @@ StEntry {
   color: #eeeeec;
   background-color: #2d2c2e;
   border-color: #1b1b1b;
-  selection-background-color: #16a085;
+  selection-background-color: #28A99D;
   selected-color: #ffffff; }
   StEntry:focus {
     border-color: rgba(154, 154, 142, 0.5); }
@@ -151,7 +151,7 @@ StScrollBar {
     StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover {
       background-color: #c9c9c7; }
     StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
-      background-color: #16a085; }
+      background-color: #28A99D; }
 
 /* Slider */
 .slider {
@@ -159,7 +159,7 @@ StScrollBar {
   -barlevel-height: 0.3em;
   -barlevel-background-color: rgba(238, 238, 236, 0.1);
   -barlevel-border-color: #1b1b1b;
-  -barlevel-active-background-color: #16a085;
+  -barlevel-active-background-color: #28A99D;
   -barlevel-active-border-color: #092444;
   -barlevel-overdrive-color: #b2161d;
   -barlevel-overdrive-border-color: #851015;
@@ -204,7 +204,7 @@ StScrollBar {
 
 /* links */
 .shell-link {
-  color: #16a085; }
+  color: #28A99D; }
   .shell-link:hover {
     color: #8fbbf0; }
 
@@ -458,7 +458,7 @@ StScrollBar {
   .audio-selection-device:hover, .audio-selection-device:focus {
     background-color: #3c3c3c; }
   .audio-selection-device:active {
-    background-color: #16a085;
+    background-color: #28A99D;
     color: #ffffff; }
 
 .audio-selection-device-box {
@@ -522,7 +522,7 @@ StScrollBar {
       background-color: rgba(255, 255, 255, 0.1);
       color: #eeeeec; }
     .popup-menu .popup-menu-item:active {
-      background-color: #16a085;
+      background-color: #28A99D;
       color: #ffffff; }
     .popup-menu .popup-menu-item:insensitive {
       color: rgba(238, 238, 236, 0.5); }
@@ -654,7 +654,7 @@ StScrollBar {
 
 /* Window Cycler */
 .cycler-highlight {
-  border: 5px solid #16a085; }
+  border: 5px solid #28A99D; }
 
 /* Workspace Switcher */
 .workspace-switcher-group {
@@ -670,7 +670,7 @@ StScrollBar {
 .ws-switcher-active-up, .ws-switcher-active-down,
 .ws-switcher-active-left, .ws-switcher-active-right {
   height: 50px;
-  background-color: #16a085;
+  background-color: #28A99D;
   color: #ffffff;
   background-size: 32px;
   border-radius: 8px; }
@@ -696,7 +696,7 @@ StScrollBar {
   border-color: #282828;
   box-shadow: none; }
   .modal-dialog StEntry:focus, .prompt-dialog StEntry:focus, .audio-device-selection-dialog StEntry:focus, .access-dialog StEntry:focus, .geolocation-dialog StEntry:focus, .extension-dialog StEntry:focus, .inhibit-shortcuts-dialog StEntry:focus, .nm-dialog StEntry:focus, .notification-banner StEntry:focus {
-    border: 2px solid #16a085; }
+    border: 2px solid #28A99D; }
 
 .modal-dialog, .prompt-dialog, .audio-device-selection-dialog, .access-dialog, .geolocation-dialog, .extension-dialog, .inhibit-shortcuts-dialog, .nm-dialog {
   color: #eeeeec;
@@ -711,7 +711,7 @@ StScrollBar {
     .modal-dialog .button:hover, .prompt-dialog .button:hover, .audio-device-selection-dialog .button:hover, .access-dialog .button:hover, .geolocation-dialog .button:hover, .extension-dialog .button:hover, .inhibit-shortcuts-dialog .button:hover, .nm-dialog .button:hover {
       background-color: #3c3c3c; }
     .modal-dialog .button:active, .prompt-dialog .button:active, .audio-device-selection-dialog .button:active, .access-dialog .button:active, .geolocation-dialog .button:active, .extension-dialog .button:active, .inhibit-shortcuts-dialog .button:active, .nm-dialog .button:active {
-      background-color: #16a085;
+      background-color: #28A99D;
       color: #ffffff; }
     .modal-dialog .button:disabled, .prompt-dialog .button:disabled, .audio-device-selection-dialog .button:disabled, .access-dialog .button:disabled, .geolocation-dialog .button:disabled, .extension-dialog .button:disabled, .inhibit-shortcuts-dialog .button:disabled, .nm-dialog .button:disabled {
       color: #919190; }
@@ -719,7 +719,7 @@ StScrollBar {
 /* Tiled window previews */
 .tile-preview {
   background-color: rgba(27, 106, 203, 0.5);
-  border: 1px solid #16a085; }
+  border: 1px solid #28A99D; }
 
 .tile-preview-left.on-primary {
   border-radius: 6px 0 0 0; }
@@ -920,7 +920,7 @@ StScrollBar {
     background-color: #3c3c3c; }
   .calendar-day-base:active, .calendar-day-base:selected {
     color: white;
-    background-color: #16a085;
+    background-color: #28A99D;
     border-color: transparent; }
   .calendar-day-base.calendar-day-heading {
     color: #fafaf9;
@@ -1077,7 +1077,7 @@ StScrollBar {
     border: none;
     padding: 14px; }
   .system-menu-action:active {
-    background-color: #16a085;
+    background-color: #28A99D;
     color: #ffffff; }
   .system-menu-action > StIcon {
     icon-size: 16px; }
@@ -1087,21 +1087,21 @@ StScrollBar {
   height: 52px;
   border-radius: 0 0 52px 0;
   background-color: rgba(188, 214, 246, 0.3);
-  box-shadow: 0 0 2px 2px #16a085; }
+  box-shadow: 0 0 2px 2px #28A99D; }
 
 .ripple-box:rtl {
   border-radius: 0 0 0 52px; }
 
 .select-area-rubberband {
   background-color: rgba(27, 106, 203, 0.3);
-  border: 1px solid #16a085; }
+  border: 1px solid #28A99D; }
 
 .ripple-pointer-location {
   width: 50px;
   height: 50px;
   border-radius: 25px 25px 25px 25px;
   background-color: rgba(143, 187, 240, 0.3);
-  box-shadow: 0 0 2px 2px #16a085; }
+  box-shadow: 0 0 2px 2px #28A99D; }
 
 .popup-menu-arrow {
   icon-size: 1.09em; }
@@ -1110,10 +1110,10 @@ StScrollBar {
   icon-size: 1.09em; }
 
 .window-close {
-  background-color: #16a085;
+  background-color: #28A99D;
   color: white;
   border-radius: 24px;
-  border: 2px solid #16a085;
+  border: 2px solid #28A99D;
   height: 24px;
   width: 24px;
   -shell-close-overlap: 11px;
@@ -1122,14 +1122,14 @@ StScrollBar {
     background-color: #1f76e1;
     border-color: #1f76e1; }
   .window-close:active {
-    background-color: #16a085;
-    border-color: #16a085; }
+    background-color: #28A99D;
+    border-color: #28A99D; }
 
 .pie-timer {
   width: 60px;
   height: 60px;
   -pie-border-width: 3px;
-  -pie-border-color: #16a085;
+  -pie-border-color: #28A99D;
   -pie-background-color: rgba(188, 214, 246, 0.3); }
 
 /* NETWORK DIALOGS */
@@ -1171,7 +1171,7 @@ StScrollBar {
   spacing: 20px; }
 
 .nm-dialog-item:selected {
-  background-color: #16a085;
+  background-color: #28A99D;
   color: #ffffff; }
 
 .nm-dialog-icons {
@@ -1208,7 +1208,7 @@ StScrollBar {
 .window-caption {
   spacing: 25px;
   color: #ffffff;
-  background-color: #16a085;
+  background-color: #28A99D;
   border-radius: 8px;
   padding: 4px 12px; }
 
@@ -1222,7 +1222,7 @@ StScrollBar {
   .search-entry:focus, .login-dialog StEntry:focus {
     padding: 6px 8px;
     border-width: 2px;
-    border-color: #16a085; }
+    border-color: #28A99D; }
   .search-entry .search-entry-icon, .login-dialog StEntry .search-entry-icon {
     icon-size: 1em;
     padding: 0 4px;
@@ -1335,7 +1335,7 @@ StScrollBar {
     box-shadow: inset 0 -2px #eeeeec; }
   .app-view-control:checked {
     color: #eeeeec;
-    box-shadow: inset 0 -2px #16a085; }
+    box-shadow: inset 0 -2px #28A99D; }
   .app-view-control:first-child {
     border-right-width: 0;
     border-radius: 0; }
@@ -1390,7 +1390,7 @@ StScrollBar {
 .app-well-app-running-dot {
   width: 10px;
   height: 3px;
-  background-color: #16a085;
+  background-color: #28A99D;
   margin-bottom: 2px; }
 
 .search-provider-icon,
@@ -1463,7 +1463,7 @@ StScrollBar {
     height: 24px; }
 
 .workspace-thumbnail-indicator {
-  border: 2px solid #16a085;
+  border: 2px solid #28A99D;
   padding: 1px; }
 
 .all-apps,
@@ -1482,7 +1482,7 @@ StScrollBar {
 
 /* NOTIFICATIONS & MESSAGE TRAY */
 .url-highlighter {
-  link-color: #16a085; }
+  link-color: #28A99D; }
 
 .notification-banner {
   font-size: 11pt;
@@ -1528,7 +1528,7 @@ StScrollBar {
   width: 1.6em;
   -shell-counter-overlap-x: 3px;
   -shell-counter-overlap-y: 3px;
-  background-color: #16a085;
+  background-color: #28A99D;
   color: #ffffff;
   border: 2px solid #eeeeec;
   box-shadow: 0 2px 2px rgba(0, 0, 0, 0.5);
@@ -1613,7 +1613,7 @@ StScrollBar {
 
 /* Eeeky things */
 .magnifier-zoom-region {
-  border: 2px solid #16a085; }
+  border: 2px solid #28A99D; }
   .magnifier-zoom-region.full-screen {
     border-width: 0; }
 
@@ -1647,7 +1647,7 @@ StScrollBar {
     color: #eeeeec;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    box-shadow: inset 0px 0px 0px 2px #16a085; }
+    box-shadow: inset 0px 0px 0px 2px #28A99D; }
   .keyboard-key:hover, .keyboard-key:checked {
     background-color: #3f3f3f; }
   .keyboard-key:active {
@@ -1666,7 +1666,7 @@ StScrollBar {
       background-color: #1b1b1b; }
   .keyboard-key.enter-key {
     border-color: #1f76e1;
-    background-color: #16a085;
+    background-color: #28A99D;
     background-image: url("resource:///org/gnome/shell/theme/key-enter.svg"); }
     .keyboard-key.enter-key:hover, .keyboard-key.enter-key:checked {
       background-color: #1d72d8; }
@@ -1699,7 +1699,7 @@ StScrollBar {
 
 .emoji-panel .keyboard-key:latched {
   border-color: #1f76e1;
-  background-color: #16a085; }
+  background-color: #28A99D; }
 
 .candidate-popup-content {
   padding: 0.5em;
@@ -1713,7 +1713,7 @@ StScrollBar {
   padding: 0.3em 0.5em 0.3em 0.5em;
   border-radius: 4px; }
   .candidate-box:selected, .candidate-box:hover {
-    background-color: #16a085;
+    background-color: #28A99D;
     color: #ffffff; }
 
 .candidate-page-button-box {
@@ -1783,16 +1783,16 @@ StScrollBar {
       color: rgba(246, 245, 244, 0.7); }
     .login-dialog .modal-dialog-button:default {
       color: #ffffff;
-      background-color: #16a085;
+      background-color: #28A99D;
       border-color: #1b1b1b;
       box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
-      border-color: #16a085; }
+      border-color: #28A99D; }
       .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus {
         color: #ffffff;
         border-color: #1b1b1b;
-        background-color: #16a085;
+        background-color: #28A99D;
         box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07);
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black;
@@ -1801,12 +1801,12 @@ StScrollBar {
       .login-dialog .modal-dialog-button:default:active {
         color: #ffffff;
         border-color: #1b1b1b;
-        background-color: #16a085;
+        background-color: #28A99D;
         text-shadow: none;
         icon-shadow: none;
         box-shadow: none;
-        background-color: #16a085;
-        border-color: #16a085; }
+        background-color: #28A99D;
+        border-color: #28A99D; }
       .login-dialog .modal-dialog-button:default:insensitive {
         color: #919190;
         border-color: #1b1b1b;
@@ -1814,8 +1814,8 @@ StScrollBar {
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none;
-        border-color: #16a085;
-        background-color: #16a085;
+        border-color: #28A99D;
+        background-color: #28A99D;
         color: rgba(255, 255, 255, 0.7); }
 
 .login-dialog-logo-bin {
@@ -1856,10 +1856,10 @@ StScrollBar {
   spacing: 12px;
   width: 23em; }
   .login-dialog-user-list:expanded .login-dialog-user-list-item:selected {
-    background-color: #16a085;
+    background-color: #28A99D;
     color: #ffffff; }
   .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
-    border-right: 2px solid #16a085; }
+    border-right: 2px solid #28A99D; }
 
 .login-dialog-user-list-item {
   border-radius: 5px;
@@ -1970,7 +1970,7 @@ StScrollBar {
   box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.4); }
 
 #lockDialogGroup {
-  background: #41494c url(resource:///org/gnome/shell/theme/noise-texture.png);
+  background: #313338 url(resource:///org/gnome/shell/theme/noise-texture.png);
   background-repeat: repeat; }
 
 #screenShieldNotifications StButton#vhandle, #screenShieldNotifications StButton#hhandle {
diff --git a/theme/manjaro.png b/theme/manjaro.png
index d92fe28..8f1699b 100644
Binary files a/theme/manjaro.png and b/theme/manjaro.png differ
diff --git a/theme/noise-texture.png b/theme/noise-texture.png
index 0aa1472..393fff3 100644
Binary files a/theme/noise-texture.png and b/theme/noise-texture.png differ