diff --git a/desktop/configs/hypr/hyprland.conf b/desktop/configs/hypr/hyprland.conf
index f94dbdf..70b261d 100644
--- a/desktop/configs/hypr/hyprland.conf
+++ b/desktop/configs/hypr/hyprland.conf
@@ -6,6 +6,7 @@ source = ~/.config/hypr/init.conf
 
 env = XCURSOR_SIZE,24
 env = QT_QPA_PLATOFORMTHEME=qt5ct
+env = QT_STYLE_OVERRIDE=kvantum
 
 source = ~/.config/hypr/settings.conf
 
diff --git a/desktop/configs/hypr/init.conf b/desktop/configs/hypr/init.conf
index 630f63e..7d6de4a 100644
--- a/desktop/configs/hypr/init.conf
+++ b/desktop/configs/hypr/init.conf
@@ -2,7 +2,7 @@ exec-once = ~/scripts/fix.sh
 exec-once = spotifyd &
 exec-once = lxqt-policykit-agent &
 exec-once = gentoo-pipewire-launcher &
-exec-once = ~/scripts/wppengine.sh
+exec-once = ~/scripts/swww.sh
 exec-once = gammastep -t 4500:3500 -l -23.5475:-46.63611 -b 1.0:0.6 &
 exec-once = gsettings set org.gnome.desktop.interface icon-theme Win10Sur-black-dark & gsettings set org.gnome.desktop.interface gtk-theme Numix-BLACK-Pomegranate & gsettings set org.gnome.desktop.interface cursor-theme Simp1e
 exec-once = dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
diff --git a/desktop/configs/hypr/rules.conf b/desktop/configs/hypr/rules.conf
index 4c198d4..df141d3 100644
--- a/desktop/configs/hypr/rules.conf
+++ b/desktop/configs/hypr/rules.conf
@@ -11,6 +11,7 @@ windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$
 windowrulev2=float,class:anki,title:Add
 windowrulev2=size 0%,class:explorer.exe,title:Wine System Tray
 windowrulev2=float, class:(firefox), title:(Picture-in-Picture)
+windowrulev2=workspace 5 silent, class:(jetbrains-idea)
 
 windowrule=float,xdg-desktop-portal-gtk
 windowrule=workspace 11 silent,org.corectrl.corectrl
@@ -49,5 +50,4 @@ windowrule=workspace 9 silent,steam_.*
 windowrule=workspace 10 silent,SFP_UI
 windowrule=workspace 4 silent,Spotify
 windowrule=workspace 3 silent,parsecd
-windowrule=workspace 12 silent,org.pwmt.zathura
 windowrule=workspace 13 silent,Chromium-browser-chromium
diff --git a/desktop/configs/tmux/tmux-solarized.conf b/desktop/configs/tmux/tmux-solarized.conf
new file mode 100644
index 0000000..33e97fa
--- /dev/null
+++ b/desktop/configs/tmux/tmux-solarized.conf
@@ -0,0 +1,60 @@
+# status bar
+set -g status-style fg=colour16,bg=colour0
+# set-option -g status-attr default
+set-option -g status-position bottom
+set-option -g status-interval 60
+set-option -g status-bg default
+set-option -g status-fg colour7
+
+# Left side of status bar
+set-option -g status-left-length 20
+# set-option -g status-left "#[fg=colour7,bg=colour0] #S #[fg=default,bg=default] "
+set-option -g status-left '#{?client_prefix,#[fg=black]#[bg=colour2]   ,#[bg=colour0] #S }#[fg=default,bg=default] '
+
+# Window status
+set-option -g window-status-format "#[fg=colour7,bg=colour0] #I #[fg=colour7,bg=colour0] #W "
+set-option -g window-status-current-format "#[fg=black,bg=colour2] #I #[fg=colour7,bg=colour0] #W "
+set-option -g window-status-separator " "
+set-option -g status-justify left
+
+# Right side of status bar
+set-option -g status-right-length 200
+set -g status-right "#{playerctl_short} | #(whoami)@#h "
+set -g @short_length "50"
+
+# set -g @short_length "30"
+# set -g @short_append_chars "..."
+# WEATHER='#(curl -s wttr.in/Berlin\?format\="%%t+%%C+%%w+%%m")'
+# set-option -g status-right "#[fg=colour7,bg=colour2]🌡 BER #[fg=colour7,bg=colour0] $WEATHER #[fg=colour7,bg=colour2]   #[fg=colour7,bg=colour0] #(whoami)@#h "
+
+# pane border
+set -g pane-border-style fg=colour238,bg=colour0
+set -g pane-active-border-style fg=colour2,bg=colour0
+
+# Pane number indicator
+set-option -g display-panes-colour colour0
+set-option -g display-panes-active-colour colour7
+
+# Clock mode
+# set-option -g clock-mode-colour colour7
+# set-option -g clock-mode-style 24
+
+# Message
+set -g message-style fg=default,bg=default
+
+# Activity
+set-option -g monitor-activity on
+set-option -g monitor-silence 0
+set-option -g monitor-bell on
+set-option -g activity-action other
+set-option -g visual-activity off
+
+# Window numbering
+set-option -g base-index 1
+set-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+# select default layout
+set-option -g main-pane-width 65
+set-option -g main-pane-height 65
+
diff --git a/desktop/configs/tofi/melange.conf b/desktop/configs/tofi/melange.conf
index cebd06a..9c8bf3d 100644
--- a/desktop/configs/tofi/melange.conf
+++ b/desktop/configs/tofi/melange.conf
@@ -1,3 +1,3 @@
-background-color = #fbf1c7DD
+background-color = #f1f1f1DD
 text-color = #54433a
-selection-color = #a06d00
+selection-color = #bc5c00
diff --git a/desktop/configs/tofi/solarized.conf b/desktop/configs/tofi/solarized.conf
new file mode 100644
index 0000000..cbbd8c6
--- /dev/null
+++ b/desktop/configs/tofi/solarized.conf
@@ -0,0 +1,3 @@
+background-color = #002b36BB
+text-color = #839496
+selection-color = #859900
diff --git a/desktop/configs/tofi/theme.conf b/desktop/configs/tofi/theme.conf
index c6df683..ff69fb4 120000
--- a/desktop/configs/tofi/theme.conf
+++ b/desktop/configs/tofi/theme.conf
@@ -1 +1 @@
-/yang/.config/tofi/melange.conf
\ No newline at end of file
+/yang/.config/tofi/solarized.conf
\ No newline at end of file
diff --git a/desktop/configs/waybar/config b/desktop/configs/waybar/config
index 4572899..27ccbcf 100644
--- a/desktop/configs/waybar/config
+++ b/desktop/configs/waybar/config
@@ -17,9 +17,9 @@
     ],
 
     "modules-right": [
-        "pulseaudio",
+      "pulseaudio",
 	    "clock",
-        "tray",
+      "tray",
     ],
 
     "hyprland/window": {
diff --git a/desktop/configs/waybar/style-melange.css b/desktop/configs/waybar/style-melange.css
index 6988a18..80122c7 100644
--- a/desktop/configs/waybar/style-melange.css
+++ b/desktop/configs/waybar/style-melange.css
@@ -7,8 +7,8 @@
 }
 
 window#waybar {
-    background: #fbf1c7;
-    color: #3c3836;
+    background: #f1f1f1;
+    color: #54433a;
 }
 
 #custom-logo {
@@ -23,13 +23,13 @@ window#waybar {
 #workspaces button {
     margin-left: 2px;
     margin-right: 10px;
-    color: #3c3836;
+    color: #54433a;
 }
 
 #workspaces button:hover,
 #workspaces button:active {
-    background-color: #fbf1c7;
-    color: #3c3836;
+    background-color: #f1f1f1;
+    color: #54433a;
 }
 
 #workspaces button.focused {
diff --git a/desktop/configs/waybar/style-solarized-light.css b/desktop/configs/waybar/style-solarized-light.css
new file mode 100644
index 0000000..66c12cc
--- /dev/null
+++ b/desktop/configs/waybar/style-solarized-light.css
@@ -0,0 +1,50 @@
+* {
+    border: none;
+    border-radius: 0;
+    padding: 0;
+    margin: 0;
+    font-size: 11px;
+}
+
+window#waybar {
+    background: #fff;
+    color: #292828;
+}
+
+#custom-logo {
+    font-size: 18px;
+    margin: 0;
+    margin-left: 7px;
+    margin-right: 12px;
+    padding: 0;
+    font-family: NotoSans Nerd Font Mono;
+}
+
+#workspaces button {
+    margin-left: 2px;
+    margin-right: 10px;
+    color: #292828;
+}
+
+#workspaces button:hover,
+#workspaces button:active {
+    background-color: #fff;
+    color: #292828;
+}
+
+#workspaces button.focused {
+    background-color: #383737;
+}
+
+#language {
+    margin-right: 7px;
+}
+
+#battery {
+    margin-left: 7px;
+    margin-right: 3px;
+}
+
+#clock {
+    margin: 0px 6px;
+}
diff --git a/desktop/configs/waybar/style-solarized.css b/desktop/configs/waybar/style-solarized.css
index 66c12cc..64d6bbf 100644
--- a/desktop/configs/waybar/style-solarized.css
+++ b/desktop/configs/waybar/style-solarized.css
@@ -7,8 +7,8 @@
 }
 
 window#waybar {
-    background: #fff;
-    color: #292828;
+    background: #002b36;
+    color: #839496;
 }
 
 #custom-logo {
@@ -23,13 +23,13 @@ window#waybar {
 #workspaces button {
     margin-left: 2px;
     margin-right: 10px;
-    color: #292828;
+    color: #839496;
 }
 
 #workspaces button:hover,
 #workspaces button:active {
-    background-color: #fff;
-    color: #292828;
+    background-color: #002b36;
+    color: #839496;
 }
 
 #workspaces button.focused {
diff --git a/desktop/scripts/change-colorscheme.sh b/desktop/scripts/change-colorscheme.sh
index b969ffd..de146ef 100755
--- a/desktop/scripts/change-colorscheme.sh
+++ b/desktop/scripts/change-colorscheme.sh
@@ -8,30 +8,47 @@ RED_NORMAL_WPP=~/pics/wallpapers/bm3.png
 RED_WIDE_LIVE=2883426230
 RED_NORMAL_LIVE=2011974721
 
+MELANGE_WIDE_WPP=~/pics/wallpapers/melange1.png
+MELANGE_NORMAL_WPP=~/pics/wallpapers/melange1.jpg
 MELANGE_WIDE_LIVE=2980001176
 MELANGE_NORMAL_LIVE=3033188884
 
+SOLARIZED_WIDE_WPP=~/pics/wallpapers/solarized5.jpg
+SOLARIZED_NORMAL_WPP=~/pics/wallpapers/solarized4.png
+
 CHOICE=$(tofi <$HOME/scripts/choices)
 
 
 case "$CHOICE" in
+    solarized)
+    ~/scripts/swww.sh $SOLARIZED_WIDE_WPP $SOLARIZED_NORMAL_WPP
+
+    #change tmux theme
+    ln -sf ~/.config/tmux/tmux-solarized.conf ~/.config/tmux/theme.conf
+    tmux source-file ~/.config/tmux/tmux.conf
+
+    # change wezterm theme
+    sed -i 's/color_scheme = .*/color_scheme = "Solarized Dark (Gogh)"/g' ~/.config/wezterm/wezterm.lua
+
+    # neofetch
+    sed -i 's/image_source=.*/image_source="$HOME\/pics\/neofetch\/sol\/☆ICON☆.jpg"/g' ~/.config/neofetch/config.conf
+    sed -i 's/{cl11}/{cl3}/' ~/.config/neofetch/config.conf
+
+    # change tofi theme
+    ln -sf ~/.config/tofi/solarized.conf ~/.config/tofi/theme.conf
+    
+    ;;
     melange)
 
     # i'll give linux-wppengine a try
-    ~/scripts/wppengine.sh $MELANGE_WIDE_LIVE $MELANGE_NORMAL_LIVE
+    ~/scripts/swww.sh $MELANGE_WIDE_WPP $MELANGE_NORMAL_WPP
 
     #change tmux theme
     ln -sf ~/.config/tmux/tmux-melange.conf ~/.config/tmux/theme.conf
     tmux source-file ~/.config/tmux/tmux.conf
 
-    # waybar white css
-    killall waybar; waybar -s ~/.config/waybar/style-solarized.css > /dev/null &
-
     # change wezterm theme
-    sed -i 's/color_scheme = .*/color_scheme = "Gruvbox light, medium (base16)"/g' ~/.config/wezterm/wezterm.lua
-
-    # change waybar theme
-    killall waybar; waybar -s ~/.config/waybar/style-melange.css > /dev/null &
+    sed -i 's/color_scheme = .*/color_scheme = "melange_light"/g' ~/.config/wezterm/wezterm.lua
 
     # neofetch
     sed -i 's/image_source=.*/image_source="$HOME\/pics\/neofetch\/melangium.jpg"/g' ~/.config/neofetch/config.conf
@@ -50,10 +67,7 @@ case "$CHOICE" in
     
     # neofetch
     sed -i 's/image_source=.*/image_source="$HOME\/pics\/rh.jpg"/g' ~/.config/neofetch/config.conf
-    sed -i '0,/cl3/{s/cl3/cl11/}' ~/.config/neofetch/config.conf
-
-    # waybar white css
-    killall waybar; waybar -s ~/.config/waybar/style-solarized.css > /dev/null &
+    sed -i 's/{cl11}/{cl3}/' ~/.config/neofetch/config.conf
 
     # change tofi theme
     ln -sf ~/.config/tofi/white.conf ~/.config/tofi/theme.conf
@@ -62,7 +76,7 @@ case "$CHOICE" in
     red)
 
     # wpp engine?
-    ~/scripts/wppengine.sh $RED_WIDE_LIVE $RED_NORMAL_LIVE
+    ~/scripts/swww.sh $RED_WIDE_WPP $RED_NORMAL_WPP
 
     # change tmux theme and reload
     ln -sf ~/.config/tmux/tmux-red.conf ~/.config/tmux/theme.conf
@@ -73,10 +87,7 @@ case "$CHOICE" in
 
     # change neofetch pic (yes lmao)
     sed -i 's/image_source=.*/image_source="$HOME\/pics\/red.jpg"/g' ~/.config/neofetch/config.conf
-    sed -i '0,/cl11/{s/cl11/cl3/}' ~/.config/neofetch/config.conf
-
-    # waybar black css
-    killall waybar; waybar > /dev/null &
+    sed -i '{cl11}/{cl3}/' ~/.config/neofetch/config.conf
 
     # change tofi theme
     ln -sf ~/.config/tofi/red.conf ~/.config/tofi/theme.conf
@@ -89,3 +100,4 @@ case "$CHOICE" in
 esac
 
 echo $CHOICE > ~/colorscheme
+hyprctl reload
diff --git a/desktop/scripts/choices b/desktop/scripts/choices
index 923c827..a07ed92 100644
--- a/desktop/scripts/choices
+++ b/desktop/scripts/choices
@@ -1,3 +1,4 @@
 white
 red
+solarized
 melange
diff --git a/desktop/scripts/firefox_to_workspace.sh b/desktop/scripts/firefox_to_workspace.sh
index b35a04f..08886be 100755
--- a/desktop/scripts/firefox_to_workspace.sh
+++ b/desktop/scripts/firefox_to_workspace.sh
@@ -2,7 +2,12 @@
 # i adapted this script from maze, a dear friend of mine
 # maze42d/dotfiles on github
 
-firefox_binary="firefox-bin"
+hostname="$(uname -a) | awk '{print $2}'"
+if [[ $hostname == "sovereign" ]]; then
+  firefox_binary="firefox"
+else
+  firefox_binary="firefox-bin"
+fi
 
 if [[ -z $1 ]]; then
   echo "Usage: $0 <profile> <workspace>"
diff --git a/desktop/scripts/hypr.sh b/desktop/scripts/hypr.sh
index 5bcccce..2f0cc62 100755
--- a/desktop/scripts/hypr.sh
+++ b/desktop/scripts/hypr.sh
@@ -4,12 +4,16 @@
 CURRENT_THEME=$(cat ~/colorscheme)
 
 case "$CURRENT_THEME" in
+    solarized)
+        killall waybar; waybar -s ~/.config/waybar/style-solarized.css > /dev/null &
+        # hyprctl keyword general:col.active_border  todo
+    ;;
     melange) 
         killall waybar; waybar -s ~/.config/waybar/style-melange.css > /dev/null &
         hyprctl keyword general:col.active_border "rgba(7892bdff) rgba(6e9b72ff) 45deg"
     ;;
     white)
-        killall waybar; waybar -s ~/.config/waybar/style-solarized.css > /dev/null &
+        killall waybar; waybar -s ~/.config/waybar/style-solarized-light.css > /dev/null &
         # hyprctl keyword general:col.active_border  todo
     ;;
     red) 
diff --git a/desktop/scripts/swww.sh b/desktop/scripts/swww.sh
index e50f393..dbc3419 100755
--- a/desktop/scripts/swww.sh
+++ b/desktop/scripts/swww.sh
@@ -12,7 +12,9 @@ if [[ -z "$1" ]]; then
             FIRST=~/pics/wallpapers/bm5.jpg
             SECOND=~/pics/wallpapers/bm3.png
         ;;
-        melange) #todo
+        melange)
+            FIRST=~/pics/wallpapers/melange1.png
+            SECOND=~/pics/wallpapers/melange1.jpg
         ;;
         white) # todo
             FIRST=~/pics/wallpapers/sl3.jpg
diff --git a/desktop/scripts/wppengine.sh b/desktop/scripts/wppengine.sh
index 5d34031..874aa3c 100755
--- a/desktop/scripts/wppengine.sh
+++ b/desktop/scripts/wppengine.sh
@@ -9,7 +9,7 @@ if [[ -z "$1" ]]; then
         ;;
         melange)
             FIRST=2980001176
-            SECOND=3033188884
+            SECOND=1607915797
         ;;
         white) # todo
         ;;