diff --git a/.config/fish/themes/Catppuccin Macchiato.theme b/.config/fish/themes/catppuccin-macchiato.theme
similarity index 100%
rename from .config/fish/themes/Catppuccin Macchiato.theme
rename to .config/fish/themes/catppuccin-macchiato.theme
diff --git a/.config/i3/config b/.config/i3/config
index 28e0d32..a2d7b39 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -71,7 +71,7 @@ bindsym $mod+Return exec $terminal
 bindsym $mod+q kill
 
 # start dmenu (a program launcher)
-bindsym $mod+d exec --no-startup-id $HOME/.config/rofi/launchers/type-6/launcher.sh
+bindsym $mod+d exec --no-startup-id $HOME/.config/rofi/launchers/type-4/launcher.sh
 # A more modern dmenu replacement is rofi:
 # bindcode $mod+40 exec "rofi -modi drun,run -show drun"
 # There also is i3-dmenu-desktop which only displays applications shipping a
@@ -230,8 +230,7 @@ assign [class="discord"] 5
 # startup programs
 exec --no-startup-id nextcloud
 exec --no-startup-id nitrogen --restore
-exec --no-startup-id i3-msg 'workspace 2; exec $browser'
-exec --no-startup-id i3-msg 'workspace 1; exec $terminal'
+exec --no-startup-id i3-msg 'workspace 2; exec $browser; workspace 1; exec $terminal'
 exec --no-startup-id openrgb -d 0 -m off -d 1 -m off
 # sets up monitors and picom
 exec_always --no-startup-id ~/.local/share/scripts/monitor.sh
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index 58a5e0d..cc4cf98 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -2,7 +2,7 @@
  *
  * Author : Aditya Shakya (adi1090x)
  * Github : @adi1090x
- * 
+ *
  * Configuration For Rofi Version: 1.7.3
  **/
 
diff --git a/.config/rofi/launchers/type-1/launcher.sh b/.config/rofi/launchers/type-1/launcher.sh
index 85b7df4..a6c5e62 100755
--- a/.config/rofi/launchers/type-1/launcher.sh
+++ b/.config/rofi/launchers/type-1/launcher.sh
@@ -12,7 +12,7 @@
 ## style-11    style-12    style-13    style-14    style-15
 
 dir="$HOME/.config/rofi/launchers/type-1"
-theme='style-1'
+theme='style-2'
 
 ## Run
 rofi \
diff --git a/.config/rofi/launchers/type-4/launcher.sh b/.config/rofi/launchers/type-4/launcher.sh
index 6572cda..696d29f 100755
--- a/.config/rofi/launchers/type-4/launcher.sh
+++ b/.config/rofi/launchers/type-4/launcher.sh
@@ -11,7 +11,7 @@
 ## style-6     style-7     style-8     style-9     style-10
 
 dir="$HOME/.config/rofi/launchers/type-4"
-theme='style-1'
+theme='style-2'
 
 ## Run
 rofi \
diff --git a/.config/rofi/launchers/type-4/shared/colors.rasi b/.config/rofi/launchers/type-4/shared/colors.rasi
index 103ad63..9062cda 100644
--- a/.config/rofi/launchers/type-4/shared/colors.rasi
+++ b/.config/rofi/launchers/type-4/shared/colors.rasi
@@ -2,7 +2,7 @@
  *
  * Author : Aditya Shakya (adi1090x)
  * Github : @adi1090x
- * 
+ *
  * Colors
  *
  * Available Colors Schemes
@@ -15,4 +15,4 @@
 
 /* Import color-scheme from `colors` directory */
 
-@import "~/.config/rofi/colors/onedark.rasi"
+@import "~/.config/rofi/colors/catppuccin.rasi"
diff --git a/.config/rofi/launchers/type-4/style-2.rasi b/.config/rofi/launchers/type-4/style-2.rasi
index 78ad79e..07f5d99 100644
--- a/.config/rofi/launchers/type-4/style-2.rasi
+++ b/.config/rofi/launchers/type-4/style-2.rasi
@@ -2,7 +2,7 @@
  *
  * Author : Aditya Shakya (adi1090x)
  * Github : @adi1090x
- * 
+ *
  * Rofi Theme File
  * Rofi Version: 1.7.3
  **/
@@ -10,12 +10,12 @@
 /*****----- Configuration -----*****/
 configuration {
 	modi:                       "drun";
-    show-icons:                 false;
+    show-icons:                 true;
     display-drun:               "";
     display-run:                "";
     display-filebrowser:        "";
     display-window:             "";
-	drun-display-format:        "{name} [<span weight='light' size='small'><i>({generic})</i></span>]";
+	drun-display-format:        "{name}";
 	window-format:              "{w} · {c} · {t}";
 }
 
@@ -56,7 +56,7 @@ window {
     location:                    center;
     anchor:                      center;
     fullscreen:                  false;
-    width:                       600px;
+    width:                       400px;
     x-offset:                    0px;
     y-offset:                    0px;
 
@@ -131,7 +131,7 @@ listview {
     reverse:                     false;
     fixed-height:                true;
     fixed-columns:               true;
-    
+
     spacing:                     0px;
     margin:                      0px;
     padding:                     0px;
@@ -201,7 +201,7 @@ element alternate.active {
 element-icon {
     background-color:            transparent;
     text-color:                  inherit;
-    size:                        24px;
+    size:                        22px;
     cursor:                      inherit;
 }
 element-text {