Merge branch 'development' into main

30 files changed, 314 insertions, 154 deletions

diff --git a/README.md b/README.md
index 5cd4b28d..a832888e 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ https://github.com/JaKooLit/Hyprland-Dots/assets/85185940/4bebe592-ca43-4962-9b5
 - To easily track changes, I will be updating the changelogs. [CHANGELOGS](https://github.com/JaKooLit/Hyprland-Dots/wiki/Changelogs)  Screenshots will be included if worth it!
 
 ### 💥 Copying / Installation / Update instructions 💥
-- [`MORE INFO HERE`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Install_Update) 
+- [`MORE INFO HERE`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Install_&_Update) 
 > [!Note] 
 > The auto copy script will create backups of intended folders to be copied. However, still a good idea to manually backup just incase script failed to backup!
 - ~/.config (btop cava hypr kitty rofi swappy swaylock swaync waybar wlogout) - These are folders to be copied.
@@ -55,17 +55,29 @@ https://github.com/JaKooLit/Hyprland-Dots/assets/85185940/4bebe592-ca43-4962-9b5
 git clone --depth=1 https://github.com/JaKooLit/Hyprland-Dots.git
 cd Hyprland-Dots
 ```
-- to copy/install/update from upstream (possible bugs)
+- to copy/install from upstream (possible bugs)
 ```bash
 chmod +x copy.sh
 ./copy.sh
 ```
-- to copy/install/update from releases (more "stable")
+- to copy/install from releases (more "stable")
 ```bash
 chmod +x release.sh
 ./release.sh
 ```
 
+- to update from releases
+> [!IMPORTANT]
+> You should atleast v2.2.3 in your hyprland dots (ls ~/.config/hypr) to check version
+> You need rsync for it to work
+
+> [!CAUTION]
+> you should have already up and running Hyprland before using this function
+```bash
+chmod +x upgrade.sh
+./upgrade.sh
+```
+
 #### 🛎️ a small note on wallpapers
 - by default, only few wallpapers will be copied (1 each dark and light plus 2 more). You will be offered to download more wallpapers. You can preview/check the additional wallpapers on [`THIS`](https://github.com/JaKooLit/Wallpaper-Bank/tree/main/wallpapers) Link
 
@@ -93,8 +105,7 @@ chmod +x release.sh
 - Waybar styles (all those new panel styles require some tweaking) - I kindly request assistance 🙏
 
 #### 🤷‍♂️ TO DO!
-- [ ] Tweak waybar layouts and Themes - in constant progress
-- [ ] Tweak rofi layouts and Themes in constant progress
+- [ ] Tweak dots - 🚧 in constant progress 
 - ~~[ ] Quite possibly switch to starship? Although starship has limited themes compared to oh-my-zsh.~~ no plans for now
 
 #### 🔮 Discord Server
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index dab6e816..885c7c6a 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -147,8 +147,10 @@ set_custom_gtk_theme() {
         echo "Selected GTK theme for $mode mode: $selected_theme"
         gsettings set $theme_setting "$selected_theme"
 
-        # Flatpak GTK apps
+        # Flatpak GTK apps (themes)
         if command -v flatpak &> /dev/null; then
+            flatpak --user override --filesystem=$HOME/.themes
+            sleep 0.5
             flatpak --user override --env=GTK_THEME="$selected_theme"
         fi
     else
@@ -168,8 +170,10 @@ set_custom_gtk_theme() {
         sed -i "s|^icon_theme=.*$|icon_theme=$selected_icon|" "$HOME/.config/qt5ct/qt5ct.conf"
         sed -i "s|^icon_theme=.*$|icon_theme=$selected_icon|" "$HOME/.config/qt6ct/qt6ct.conf"
 
-        # Flatpak GTK apps
+        # Flatpak GTK apps (icons)
         if command -v flatpak &> /dev/null; then
+            flatpak --user override --filesystem=$HOME/.icons
+            sleep 0.5
             flatpak --user override --env=ICON_THEME="$selected_icon"
         fi
     else
diff --git a/config/hypr/v2.2.3 b/config/hypr/v2.2.4
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.2.3
+++ b/config/hypr/v2.2.4
diff --git a/config/rofi/config-compact.rasi b/config/rofi/config-compact.rasi
index b5b45592..2d68a6d0 100644
--- a/config/rofi/config-compact.rasi
+++ b/config/rofi/config-compact.rasi
@@ -39,7 +39,7 @@ window {
     enabled:                    true;
     border-radius:              15px;
     border-radius:              15px;
- 	background-color:           @background-color;
+    background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -47,10 +47,9 @@ mainbox {
     enabled:                    true;
     orientation:                horizontal;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "imagebox"];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/config-long.rasi b/config/rofi/config-long.rasi
index ca6edf1a..9813d7e6 100644
--- a/config/rofi/config-long.rasi
+++ b/config/rofi/config-long.rasi
@@ -39,7 +39,7 @@ window {
     fullscreen:                 false;
     enabled:                    true;
     border-radius:              12px;
- 	background-color:           @background-color;
+    background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -47,10 +47,9 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "imagebox" ];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/config-rofi-Beats.rasi b/config/rofi/config-rofi-Beats.rasi
index 8619b670..e59ace13 100644
--- a/config/rofi/config-rofi-Beats.rasi
+++ b/config/rofi/config-rofi-Beats.rasi
@@ -40,7 +40,7 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+    background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -48,10 +48,9 @@ mainbox {
     enabled:                    true;
     orientation:                horizontal;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "imagebox"];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi
index 5f1cb172..3df1f67b 100644
--- a/config/rofi/config-wallpaper.rasi
+++ b/config/rofi/config-wallpaper.rasi
@@ -3,18 +3,18 @@
 
 /* ---- Configuration ---- */
 configuration {
-    modi:                   "drun,run,filebrowser";
-    font:                   "Fira Code SemiBold 12";
-    show-icons:             true;
-    display-drun:           "";
-	display-run:            "";
-    display-filebrowser:   	"";
-    display-window:        	"";
-	drun-display-format: 	"{name}";
-    hover-select:           true;
-    me-select-entry:        "MouseSecondary";
-    me-accept-entry:        "MousePrimary";
-    window-format:          "{w} · {c} · {t}";
+    modi:                  "drun,run,filebrowser";
+    font:                  "Fira Code SemiBold 12";
+    show-icons:            true;
+    display-drun:          "";
+	display-run:           "";
+    display-filebrowser:   "";
+    display-window:        "";
+	drun-display-format:   "{name}";
+    hover-select:          true;
+    me-select-entry:       "MouseSecondary";
+    me-accept-entry:       "MousePrimary";
+    window-format:         "{w} · {c} · {t}";
 	dpi:					1;
     
 }
@@ -25,7 +25,7 @@ configuration {
 /* ---- Window ---- */
 window {
     width:					700px;
-	/*height:				 450px;*/
+	/*height:				450px;*/
     x-offset:               0px;
     y-offset:               0px;
     spacing:                0px;
@@ -40,7 +40,6 @@ window {
     enabled:                true;
     border-radius:          12px;
     border-radius:          12px;
- 	background-color:     	transparent;
 	background-image:   	url("~/.config/rofi/.current_wallpaper", height);
 }
 
@@ -143,66 +142,64 @@ element normal.normal {
 }
 
 element normal.urgent {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element normal.active {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element selected.normal {
-    background-color:       @selected-normal-background;
-    text-color:             @foreground;
+    background-color:      @selected-normal-background;
+    text-color:            @foreground;
 }
 
 element selected.urgent {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element selected.active {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element alternate.normal {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element alternate.urgent {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element alternate.active {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element-icon {
-    background-color:       transparent;
-    text-color:             inherit;
-    size:                   130px;
-    cursor:                 inherit;
+    background-color:      transparent;
+    text-color:            inherit;
+    size:                  130px;
+    cursor:                inherit;
 }
 
 
 element-text {
-	font:                   "Fira Code SemiBold 8";
-    background-color:       transparent;
-    text-color:             inherit;
-    cursor:                 inherit;
-    vertical-align:         0.5;
-    horizontal-align:       0.5;
+	font:                  "Fira Code SemiBold 8";
+    background-color:      transparent;
+    text-color:            inherit;
+    cursor:                inherit;
 }
 
 /*****----- Message -----*****/
 message {
     background-color:       @background;
-    margin:					20px 0px 0px 0px;
+    margin:				    20px 0px 0px 0px;
     border-radius: 			10px;
 }
 
diff --git a/config/rofi/config-waybar-layout.rasi b/config/rofi/config-waybar-layout.rasi
index ff72895a..18f7b8f9 100644
--- a/config/rofi/config-waybar-layout.rasi
+++ b/config/rofi/config-waybar-layout.rasi
@@ -40,7 +40,7 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+ 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -48,7 +48,7 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "inputbar", "listbox"];
     border-radius:              12px;
 }
diff --git a/config/rofi/config-waybar-style.rasi b/config/rofi/config-waybar-style.rasi
index f0132ee4..b48ef8c7 100644
--- a/config/rofi/config-waybar-style.rasi
+++ b/config/rofi/config-waybar-style.rasi
@@ -40,7 +40,7 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+ 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -48,7 +48,7 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "inputbar", "listbox"];
     border-radius:              12px;
 }
diff --git a/config/rofi/config-zsh-theme.rasi b/config/rofi/config-zsh-theme.rasi
index d669ccfa..c6aff123 100644
--- a/config/rofi/config-zsh-theme.rasi
+++ b/config/rofi/config-zsh-theme.rasi
@@ -41,7 +41,7 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+ 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -49,10 +49,9 @@ mainbox {
     enabled:                    true;
     orientation:                horizontal;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
+    background-color:           transparent;
     children:                   [ "imagebox"];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index 50cd75be..d21800f6 100644
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -39,7 +39,7 @@ window {
     fullscreen:                 false;
     enabled:                    true;
     border-radius:              12px;
- 	background-color:           @background-color;
+    background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -47,7 +47,7 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
+    background-color:           transparent;
     children:                   [ "inputbar", "imagebox" ];
     border-radius:              12px;
 }
@@ -118,7 +118,7 @@ mode-switcher{
 }
 
 button {
-    padding:                   0px 10px 0px 10px;
+    padding:                   0px 12px 0px 8px;
     border-radius:             12px;
     background-color:          @background;
     text-color:                inherit;
diff --git a/config/rofi/resolution/1080p/config-compact.rasi b/config/rofi/resolution/1080p/config-compact.rasi
index b5b45592..2d68a6d0 100644
--- a/config/rofi/resolution/1080p/config-compact.rasi
+++ b/config/rofi/resolution/1080p/config-compact.rasi
@@ -39,7 +39,7 @@ window {
     enabled:                    true;
     border-radius:              15px;
     border-radius:              15px;
- 	background-color:           @background-color;
+    background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -47,10 +47,9 @@ mainbox {
     enabled:                    true;
     orientation:                horizontal;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "imagebox"];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/resolution/1080p/config-long.rasi b/config/rofi/resolution/1080p/config-long.rasi
index ca6edf1a..9813d7e6 100644
--- a/config/rofi/resolution/1080p/config-long.rasi
+++ b/config/rofi/resolution/1080p/config-long.rasi
@@ -39,7 +39,7 @@ window {
     fullscreen:                 false;
     enabled:                    true;
     border-radius:              12px;
- 	background-color:           @background-color;
+    background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -47,10 +47,9 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "imagebox" ];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/resolution/1080p/config-rofi-Beats.rasi b/config/rofi/resolution/1080p/config-rofi-Beats.rasi
index 8619b670..e59ace13 100644
--- a/config/rofi/resolution/1080p/config-rofi-Beats.rasi
+++ b/config/rofi/resolution/1080p/config-rofi-Beats.rasi
@@ -40,7 +40,7 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+    background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -48,10 +48,9 @@ mainbox {
     enabled:                    true;
     orientation:                horizontal;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "imagebox"];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/resolution/1080p/config-wallpaper.rasi b/config/rofi/resolution/1080p/config-wallpaper.rasi
index 5f1cb172..3df1f67b 100644
--- a/config/rofi/resolution/1080p/config-wallpaper.rasi
+++ b/config/rofi/resolution/1080p/config-wallpaper.rasi
@@ -3,18 +3,18 @@
 
 /* ---- Configuration ---- */
 configuration {
-    modi:                   "drun,run,filebrowser";
-    font:                   "Fira Code SemiBold 12";
-    show-icons:             true;
-    display-drun:           "";
-	display-run:            "";
-    display-filebrowser:   	"";
-    display-window:        	"";
-	drun-display-format: 	"{name}";
-    hover-select:           true;
-    me-select-entry:        "MouseSecondary";
-    me-accept-entry:        "MousePrimary";
-    window-format:          "{w} · {c} · {t}";
+    modi:                  "drun,run,filebrowser";
+    font:                  "Fira Code SemiBold 12";
+    show-icons:            true;
+    display-drun:          "";
+	display-run:           "";
+    display-filebrowser:   "";
+    display-window:        "";
+	drun-display-format:   "{name}";
+    hover-select:          true;
+    me-select-entry:       "MouseSecondary";
+    me-accept-entry:       "MousePrimary";
+    window-format:         "{w} · {c} · {t}";
 	dpi:					1;
     
 }
@@ -25,7 +25,7 @@ configuration {
 /* ---- Window ---- */
 window {
     width:					700px;
-	/*height:				 450px;*/
+	/*height:				450px;*/
     x-offset:               0px;
     y-offset:               0px;
     spacing:                0px;
@@ -40,7 +40,6 @@ window {
     enabled:                true;
     border-radius:          12px;
     border-radius:          12px;
- 	background-color:     	transparent;
 	background-image:   	url("~/.config/rofi/.current_wallpaper", height);
 }
 
@@ -143,66 +142,64 @@ element normal.normal {
 }
 
 element normal.urgent {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element normal.active {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element selected.normal {
-    background-color:       @selected-normal-background;
-    text-color:             @foreground;
+    background-color:      @selected-normal-background;
+    text-color:            @foreground;
 }
 
 element selected.urgent {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element selected.active {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element alternate.normal {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element alternate.urgent {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element alternate.active {
-    background-color:       inherit;
-    text-color:             @foreground;
+    background-color:      inherit;
+    text-color:            @foreground;
 }
 
 element-icon {
-    background-color:       transparent;
-    text-color:             inherit;
-    size:                   130px;
-    cursor:                 inherit;
+    background-color:      transparent;
+    text-color:            inherit;
+    size:                  130px;
+    cursor:                inherit;
 }
 
 
 element-text {
-	font:                   "Fira Code SemiBold 8";
-    background-color:       transparent;
-    text-color:             inherit;
-    cursor:                 inherit;
-    vertical-align:         0.5;
-    horizontal-align:       0.5;
+	font:                  "Fira Code SemiBold 8";
+    background-color:      transparent;
+    text-color:            inherit;
+    cursor:                inherit;
 }
 
 /*****----- Message -----*****/
 message {
     background-color:       @background;
-    margin:					20px 0px 0px 0px;
+    margin:				    20px 0px 0px 0px;
     border-radius: 			10px;
 }
 
diff --git a/config/rofi/resolution/1080p/config-waybar-layout.rasi b/config/rofi/resolution/1080p/config-waybar-layout.rasi
index ff72895a..18f7b8f9 100644
--- a/config/rofi/resolution/1080p/config-waybar-layout.rasi
+++ b/config/rofi/resolution/1080p/config-waybar-layout.rasi
@@ -40,7 +40,7 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+ 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -48,7 +48,7 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "inputbar", "listbox"];
     border-radius:              12px;
 }
diff --git a/config/rofi/resolution/1080p/config-waybar-style.rasi b/config/rofi/resolution/1080p/config-waybar-style.rasi
index f0132ee4..b48ef8c7 100644
--- a/config/rofi/resolution/1080p/config-waybar-style.rasi
+++ b/config/rofi/resolution/1080p/config-waybar-style.rasi
@@ -40,7 +40,7 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+ 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -48,7 +48,7 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "inputbar", "listbox"];
     border-radius:              12px;
 }
diff --git a/config/rofi/resolution/1080p/config-zsh-theme.rasi b/config/rofi/resolution/1080p/config-zsh-theme.rasi
index d669ccfa..c6aff123 100644
--- a/config/rofi/resolution/1080p/config-zsh-theme.rasi
+++ b/config/rofi/resolution/1080p/config-zsh-theme.rasi
@@ -41,7 +41,7 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+ 	background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -49,10 +49,9 @@ mainbox {
     enabled:                    true;
     orientation:                horizontal;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
+    background-color:           transparent;
     children:                   [ "imagebox"];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi
index 50cd75be..d21800f6 100644
--- a/config/rofi/resolution/1080p/config.rasi
+++ b/config/rofi/resolution/1080p/config.rasi
@@ -39,7 +39,7 @@ window {
     fullscreen:                 false;
     enabled:                    true;
     border-radius:              12px;
- 	background-color:           @background-color;
+    background-image:           url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -47,7 +47,7 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
+    background-color:           transparent;
     children:                   [ "inputbar", "imagebox" ];
     border-radius:              12px;
 }
@@ -118,7 +118,7 @@ mode-switcher{
 }
 
 button {
-    padding:                   0px 10px 0px 10px;
+    padding:                   0px 12px 0px 8px;
     border-radius:             12px;
     background-color:          @background;
     text-color:                inherit;
diff --git a/config/rofi/resolution/1440p/config-compact.rasi b/config/rofi/resolution/1440p/config-compact.rasi
index 029fdbdf..825fff62 100644
--- a/config/rofi/resolution/1440p/config-compact.rasi
+++ b/config/rofi/resolution/1440p/config-compact.rasi
@@ -39,7 +39,7 @@ window {
     enabled:                    true;
     border-radius:              15px;
     border-radius:              15px;
- 	background-color:           @background-color;
+    background-image:           url("~/.config/rofi/.current_wallpaper", height);	
 }
 
 /* ---- Mainbox ---- */
@@ -47,10 +47,9 @@ mainbox {
     enabled:                    true;
     orientation:                horizontal;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "imagebox"];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/resolution/1440p/config-long.rasi b/config/rofi/resolution/1440p/config-long.rasi
index d4c55ac7..f8d0b4bf 100644
--- a/config/rofi/resolution/1440p/config-long.rasi
+++ b/config/rofi/resolution/1440p/config-long.rasi
@@ -39,7 +39,8 @@ window {
     fullscreen:                 false;
     enabled:                    true;
     border-radius:              12px;
- 	background-color:           @background-color;
+    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
+ 	
 }
 
 /* ---- Mainbox ---- */
@@ -47,10 +48,9 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "imagebox" ];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/resolution/1440p/config-rofi-Beats.rasi b/config/rofi/resolution/1440p/config-rofi-Beats.rasi
index 521875f2..141c9ed4 100644
--- a/config/rofi/resolution/1440p/config-rofi-Beats.rasi
+++ b/config/rofi/resolution/1440p/config-rofi-Beats.rasi
@@ -40,7 +40,8 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+    background-image:           url("~/.config/rofi/.current_wallpaper", height);
+ 	
 }
 
 /* ---- Mainbox ---- */
@@ -48,10 +49,9 @@ mainbox {
     enabled:                    true;
     orientation:                horizontal;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "imagebox"];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/resolution/1440p/config-wallpaper.rasi b/config/rofi/resolution/1440p/config-wallpaper.rasi
index 0bc3b106..3f01dc0a 100644
--- a/config/rofi/resolution/1440p/config-wallpaper.rasi
+++ b/config/rofi/resolution/1440p/config-wallpaper.rasi
@@ -40,7 +40,6 @@ window {
     enabled:                true;
     border-radius:          12px;
     border-radius:          12px;
- 	background-color:     	transparent;
 	background-image:   	url("~/.config/rofi/.current_wallpaper", height);
 }
 
diff --git a/config/rofi/resolution/1440p/config-waybar-layout.rasi b/config/rofi/resolution/1440p/config-waybar-layout.rasi
index b4484563..b829de39 100644
--- a/config/rofi/resolution/1440p/config-waybar-layout.rasi
+++ b/config/rofi/resolution/1440p/config-waybar-layout.rasi
@@ -40,7 +40,7 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -48,7 +48,7 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "inputbar", "listbox"];
     border-radius:              12px;
 }
diff --git a/config/rofi/resolution/1440p/config-waybar-style.rasi b/config/rofi/resolution/1440p/config-waybar-style.rasi
index 6700c1d6..de7e6933 100644
--- a/config/rofi/resolution/1440p/config-waybar-style.rasi
+++ b/config/rofi/resolution/1440p/config-waybar-style.rasi
@@ -40,7 +40,7 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+ 	background-image:    		url("~/.config/rofi/.current_wallpaper", height);
 }
 
 /* ---- Mainbox ---- */
@@ -48,7 +48,7 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:    		url("~/.config/rofi/.current_wallpaper", height);
+    background-color:           transparent;
     children:                   [ "inputbar", "listbox"];
     border-radius:              12px;
 }
diff --git a/config/rofi/resolution/1440p/config-zsh-theme.rasi b/config/rofi/resolution/1440p/config-zsh-theme.rasi
index 7173c3ae..9ab3c0a6 100644
--- a/config/rofi/resolution/1440p/config-zsh-theme.rasi
+++ b/config/rofi/resolution/1440p/config-zsh-theme.rasi
@@ -41,7 +41,7 @@ window {
     enabled:                    true;
     border-radius:              12px;
     border-radius:              12px;
- 	background-color:           @background-color;
+    background-image:           url("~/.config/rofi/.current_wallpaper", width);
 }
 
 /* ---- Mainbox ---- */
@@ -49,10 +49,9 @@ mainbox {
     enabled:                    true;
     orientation:                horizontal;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
+    background-color:           transparent;
     children:                   [ "imagebox"];
     border-radius:              12px;
-    background-color:      		@background;
 }
 
 /* ---- Imagebox ---- */
diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi
index 250c46b4..83c481cf 100644
--- a/config/rofi/resolution/1440p/config.rasi
+++ b/config/rofi/resolution/1440p/config.rasi
@@ -39,7 +39,8 @@ window {
     fullscreen:                 false;
     enabled:                    true;
     border-radius:              12px;
- 	background-color:           @background-color;
+	background-image:           url("~/.config/rofi/.current_wallpaper", width);
+ 	
 }
 
 /* ---- Mainbox ---- */
@@ -47,7 +48,7 @@ mainbox {
     enabled:                    true;
     orientation:                vertical;
 	padding:					8px;
-    background-image:           url("~/.config/rofi/.current_wallpaper", width);
+    background-color:           transparent;
     children:                   [ "inputbar", "imagebox" ];
     border-radius:              12px;
 }
@@ -118,7 +119,7 @@ mode-switcher{
 }
 
 button {
-    padding:                   0px 10px 0px 10px;
+    padding:                   0px 12px 0px 8px;
     border-radius:             12px;
     background-color:          @background;
     text-color:                inherit;
diff --git a/config/swaync/style.css b/config/swaync/style.css
index f0d41fb4..728e2157 100644
--- a/config/swaync/style.css
+++ b/config/swaync/style.css
@@ -162,6 +162,7 @@
 .control-center {
     background: @noti-bg;
     border: 2px solid @noti-border-color;
+	color: @text-color;
     border-radius: 10px;
 }
 
diff --git a/copy.sh b/copy.sh
index 9bdd16ff..7b513a90 100755
--- a/copy.sh
+++ b/copy.sh
@@ -28,8 +28,13 @@ ORANGE=$(tput setaf 166)
 YELLOW=$(tput setaf 3)
 RESET=$(tput sgr0)
 
+# Create Directory for Copy Logs
+if [ ! -d Copy-Logs ]; then
+    mkdir Copy-Logs
+fi
+
 # Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_dotfiles.log"
+LOG="Copy-Logs/install-$(date +%d-%H%M%S)_dotfiles.log"
 
 # update home folders
 xdg-user-dirs-update 2>&1 | tee -a "$LOG" || true
@@ -85,6 +90,7 @@ while true; do
             # If the detected layout is correct, update the 'kb_layout=' line in the file
             awk -v layout="$layout" '/kb_layout/ {$0 = "  kb_layout=" layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf
             mv temp.conf config/hypr/UserConfigs/UserSettings.conf
+            echo "${NOTE} kb_layout $layout configured in settings.  " 2>&1 | tee -a "$LOG"
             break ;;
         [nN])
             printf "\n%.0s" {1..2}
@@ -98,6 +104,7 @@ while true; do
             # Update the 'kb_layout=' line with the correct layout in the file
             awk -v new_layout="$new_layout" '/kb_layout/ {$0 = "  kb_layout=" new_layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf
             mv temp.conf config/hypr/UserConfigs/UserSettings.conf
+            echo "${NOTE} kb_layout $new_layout configured in settings." 2>&1 | tee -a "$LOG" 
             break ;;
         *)
             echo "Please enter either 'y' or 'n'." ;;
@@ -129,7 +136,7 @@ while true; do
 done
 
 # Use the selected resolution in your existing script
-echo "You chose $resolution resolution for better Rofi appearance."
+echo "You chose $resolution resolution for better Rofi appearance." 2>&1 | tee -a "$LOG"
 
 # Add your commands based on the resolution choice
 if [ "$resolution" == "≤ 1080p" ]; then
@@ -211,21 +218,21 @@ while true; do
         [Yy])
             echo "${NOTE} Downloading additional wallpapers..."
             if git clone "https://github.com/JaKooLit/Wallpaper-Bank.git"; then
-                echo "${NOTE} Wallpapers downloaded successfully."
+                echo "${NOTE} Wallpapers downloaded successfully." 2>&1 | tee -a "$LOG"
 
                 if cp -R Wallpaper-Bank/wallpapers/* ~/Pictures/wallpapers/ >> "$LOG" 2>&1; then
-                    echo "${NOTE} Wallpapers copied successfully."
+                    echo "${NOTE} Wallpapers copied successfully." 2>&1 | tee -a "$LOG"
                     rm -rf Wallpaper-Bank 2>&1 # Remove cloned repository after copying wallpapers
                     break
                 else
-                    echo "${ERROR} Copying wallpapers failed" >&2
+                    echo "${ERROR} Copying wallpapers failed" 2>&1 | tee -a "$LOG"
                 fi
             else
-                echo "${ERROR} Downloading additional wallpapers failed" >&2
+                echo "${ERROR} Downloading additional wallpapers failed" 2>&1 | tee -a "$LOG"
             fi
             ;;
         [Nn])
-            echo "You chose not to download additional wallpapers." >&2
+            echo "You chose not to download additional wallpapers." 2>&1 | tee -a "$LOG"
             break
             ;;
         *)
diff --git a/upgrade.sh b/upgrade.sh
new file mode 100755
index 00000000..03467b27
--- /dev/null
+++ b/upgrade.sh
@@ -0,0 +1,153 @@
+#!/bin/bash
+### https://github.com/JaKooLit/JaKooLit
+
+# Set some colors for output messages
+OK="$(tput setaf 2)[OK]$(tput sgr0)"
+ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
+NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
+WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
+CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
+ORANGE=$(tput setaf 166)
+YELLOW=$(tput setaf 3)
+RESET=$(tput sgr0)
+
+
+# Create Directory for Upgrade Logs
+if [ ! -d Upgrade-Logs ]; then
+    mkdir Upgrade-Logs
+fi
+
+LOG="Upgrade-Logs/upgrade-$(date +%d-%H%M%S)_dotfiles.log"
+
+# source and target versions
+source_dir="config"
+target_dir="$HOME/.config"
+
+# Specify the update source directories, their corresponding target directories, and their exclusions
+declare -A directories=(
+    ["config/hypr/"]="$HOME/.config/hypr/"
+    ["config/kitty/"]="$HOME/.config/kitty/"
+    ["config/Kvantum/"]="$HOME/.config/Kvantum/"
+    ["config/qt5ct/"]="$HOME/.config/qt5ct"
+    ["config/qt6ct/"]="$HOME/.config/qt6ct/"
+    ["config/rofi/"]="$HOME/.config/rofi/"
+    ["config/swaync/"]="$HOME/.config/swaync/"
+    ["config/waybar/"]="$HOME/.config/waybar/"
+    # Add more directories to compare as needed
+)
+
+# Update the exclusion rules
+declare -A exclusions=(
+    ["config/hypr/"]="--exclude=UserConfigs/ --exclude=UserScripts/"
+    ["config/waybar/"]="--exclude=config --exclude=style.css"
+    ["config/rofi/"]="--exclude=pywal-color/ --exclude=.current_wallpaper"
+    ["config/waybar/"]="--exclude=config --exclude=style.css --exclude=modules"
+    # Add more exclusions as needed
+)
+
+# Function to compare directories
+compare_directories() {
+    local source_dir="$1"
+    local target_dir="$2"
+    local exclusion="${exclusions[$source_dir]}"  # Get exclusions for the source directory
+
+    # Perform dry-run comparison using rsync with exclusions
+    diff=$(rsync -avn --delete "$source_dir" "$target_dir" $exclusion)
+    echo "$diff"
+}
+
+# Function to create backup of target directory
+create_backup() {
+    local target_dir="$1"
+    local backup_suffix="-b4-upgrade"
+    local target_base=$(basename "$target_dir")
+    local backup_dir="$HOME/.config/${target_base}${backup_suffix}"
+
+    if [ -d "$backup_dir" ]; then
+        echo "$NOTE Updating existing backup of the $target_dir..."
+        rsync -av --delete "$target_dir" "$backup_dir"
+        echo "$NOTE $backup_dir Backup updated successfully." 2>&1 | tee -a "$LOG"
+    else
+        echo "$NOTE Creating backup of the $target_dir..."
+        rsync -av --exclude="${backup_suffix}" "$target_dir" "$backup_dir"/
+        echo "$NOTE $backup_dir Backup created successfully." 2>&1 | tee -a "$LOG"
+    fi
+}
+
+# Check if the version file exists in target directory, if not exit
+target_version_file=$(find "$target_dir/hypr" -name 'v*' | sort -V | tail -n 1)
+if [ -z "$target_version_file" ]; then
+    echo "$ERROR Version number not found in ~/.config/hypr/" 2>&1 | tee -a "$LOG"
+    echo "$ERROR Upgrade your dots first by running ./copy.sh" 2>&1 | tee -a "$LOG"
+    exit 1
+fi
+
+# Get the stored version from the target directory
+stored_version=$(basename "$target_version_file")
+
+# Get the latest version from the source directory
+source_version_file=$(find "$source_dir/hypr" -name 'v*' | sort -V | tail -n 1)
+latest_version=$(basename "$source_version_file")
+
+# Function to compare versions
+version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; }
+
+# Compare versions
+if version_gt "$latest_version" "$stored_version"; then
+    echo "$CAT newer version ($latest_version) is available. Do you want to upgrade? (Y/N)" 2>&1 | tee -a "$LOG"
+    read -r answer
+    if [[ "$answer" =~ ^[Yy]$ ]]; then
+        # Loop through directories for comparison
+		for source_folder in "${!directories[@]}"; do
+    	target_folder="${directories[$source_folder]}"
+    	echo "$YELLOW Comparing directories: $source_folder and $target_folder" $RESET    
+    	# Compare source and target folders
+    	comparison=$(compare_directories "$source_folder" "$target_folder")
+    	if [ -n "$comparison" ]; then
+        echo "$NOTE Here are difference of $source_folder and $target_folder:"
+        echo "$comparison"
+        
+        printf "\n%.0s" {1..2}
+        
+        # Prompt user for action
+        echo "$CAT Do you want to copy files and folders from $source_folder to $target_folder? (Y/N)"
+        read -r answer
+
+        if [[ "$answer" =~ ^[Yy]$ ]]; then
+            # Creating backup of the target folder
+            create_backup "$target_folder"
+            
+            printf "\n%.0s" {1..2}
+            # Copy differences from source folder to target folder
+            rsync -av --delete ${exclusions[$source_folder]} "$source_folder" "$target_folder"
+            echo "$NOTE Differences of "$target_folder" copied successfully." 2>&1 | tee -a "$LOG"
+            printf "\n%.0s" {1..2}
+        else
+            	echo "$NOTE No changes were made for $target_folder" 2>&1 | tee -a "$LOG"
+        	fi
+    	else
+        	echo "$OK No differences found between $source_folder and $target_folder" 2>&1 | tee -a "$LOG"
+    	fi
+		done
+		printf "\n%.0s" {1..2}
+        echo "$NOTE Files or Folders updated successfully to version $latest_version" 2>&1 | tee -a "$LOG"
+
+		# Set some files as executable
+		chmod +x ~/.config/hypr/scripts/* 2>&1 | tee -a "$LOG"
+		chmod +x ~/.config/hypr/UserScripts/* 2>&1 | tee -a "$LOG"
+		chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG"
+		
+    else
+        echo "$ORANGE Upgrade declined. No files or folders changed" 2>&1 | tee -a "$LOG"
+    fi
+else
+    echo "$OK No upgrade found. The installed version ($stored_version) is up to date with the Hyprland-Dots version ($latest_version)." 2>&1 | tee -a "$LOG"
+fi
+
+printf "\n%.0s" {1..3}
+echo "$(tput bold)$(tput setaf 3)ATTENTION!!!! VERY IMPORTANT NOTICE!!!! $(tput sgr0)" 
+echo "$(tput bold)$(tput setaf 7)If you updated waybar folder, and you have your own waybar layout and styles $(tput sgr0)"
+echo "$(tput bold)$(tput setaf 7)Copy those files from the created backup ~/.config/waybar-b4-upgrade $(tput sgr0)"
+echo "$(tput bold)$(tput setaf 7)Make sure to set your waybar and style before logout or reboot $(tput sgr0)"
+echo "$(tput bold)$(tput setaf 7)SUPER CTRL B for Waybar Styles and SUPER ALT B for Waybar Layout $(tput sgr0)"
+printf "\n%.0s" {1..3}