diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables
index a7d9352..7f6c5d3 100644
--- a/fish/.config/fish/fish_variables
+++ b/fish/.config/fish/fish_variables
@@ -1,42 +1,38 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
-SETUVAR --export BROWSER:wslview
 SETUVAR --export COMPOSE_BAKE:true
 SETUVAR --export DISPLAY:\x3a0
 SETUVAR --export EDITOR:nvim
-SETUVAR --export PYENV_ROOT:/home/tfoerster/\x2epyenv
 SETUVAR --export VISUAL:nvim
 SETUVAR --export _JAVA_AWT_WM_NONREPARENTING:1
-SETUVAR __fish_initialized:3800
-SETUVAR fish_color_autosuggestion:666666
+SETUVAR fish_color_autosuggestion:4c566a
 SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:569CD6
-SETUVAR fish_color_comment:6A9955
-SETUVAR fish_color_cwd:4EC9B0
-SETUVAR fish_color_cwd_root:F14C4C
-SETUVAR fish_color_end:C586C0
-SETUVAR fish_color_error:F14C4C
-SETUVAR fish_color_escape:D7BA7D
+SETUVAR fish_color_command:green
+SETUVAR fish_color_comment:434c5e
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:88c0d0
+SETUVAR fish_color_error:ebcb8b
+SETUVAR fish_color_escape:00a6b2
 SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:569CD6
-SETUVAR fish_color_host_remote:DCDCAA
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
 SETUVAR fish_color_keyword:C586C0
-SETUVAR fish_color_match:\x2d\x2dbackground\x3d264F78
+SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
 SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:D4D4D4
+SETUVAR fish_color_operator:00a6b2
 SETUVAR fish_color_option:9CDCFE
 SETUVAR fish_color_param:normal
-SETUVAR fish_color_quote:CE9178
-SETUVAR fish_color_redirection:9CDCFE
-SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d264F78
-SETUVAR fish_color_selection:E5E5E5\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3d264F78
-SETUVAR fish_color_status:F14C4C
-SETUVAR fish_color_user:9CDCFE
+SETUVAR fish_color_quote:999900
+SETUVAR fish_color_redirection:00afff
+SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
 SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_key_bindings:fish_default_key_bindings
 SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:9D9D9D
-SETUVAR fish_pager_color_prefix:569CD6\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:E5E5E5\x1e\x2d\x2dbackground\x3d264F78
-SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3d264F78
-SETUVAR fish_user_paths:/home/tfoerster/\x2eopencode/bin\x1e/home/tfoerster/\x2elocal/bin
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_user_paths:/home/n0x/\x2ecargo/bin\x1e/home/n0x/\x2elocal/bin
diff --git a/gtktheme/.config/gtk-4.0/settings.ini b/gtktheme/.config/gtk-4.0/settings.ini
index e1dd3fa..eb36bc3 100644
--- a/gtktheme/.config/gtk-4.0/settings.ini
+++ b/gtktheme/.config/gtk-4.0/settings.ini
@@ -5,5 +5,3 @@ gtk-font-name=Noto Sans 11
 gtk-cursor-theme-name=default
 gtk-cursor-theme-size=24
 gtk-application-prefer-dark-theme=1
-# macOS-style button placement (all on the left), matching gtk-3.0
-gtk-decoration-layout=close,minimize,maximize:
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 9a31cfe..3beecd9 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -18,7 +18,7 @@
   "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" },
   "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
-  "rustaceanvim": { "branch": "main", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" },
+  "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },
   "vim-floaterm": { "branch": "master", "commit": "bb4ba7952e906408e1f83b215f55ffe57efcade6" },
diff --git a/nwg/.config/nwg-look/config b/nwg/.config/nwg-look/config
index 3f49ae5..50cd4cf 100644
--- a/nwg/.config/nwg-look/config
+++ b/nwg/.config/nwg-look/config
@@ -3,5 +3,8 @@
  "export-gtkrc-20": true,
  "export-index-theme": true,
  "export-xsettingsd": true,
- "export-gtk4-symlinks": true
+ "export-gtk4-symlinks": true,
+ "flatpak-export-gtk-theme-override": false,
+ "flatpak-export-icon-theme-override": false,
+ "flatpak-install-current-gtk-theme": false
 }
\ No newline at end of file
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index 7461183..34d717e 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -10,36 +10,36 @@
     // Choose the order of the modules
     "modules-left": ["hyprland/workspaces","hyprland/window"],
     "modules-center": ["clock"],
-    "modules-right": ["pulseaudio", "backlight", "network", "battery", "cpu", "memory", "tray"],
+    "modules-right": ["pulseaudio", "network", "cpu", "memory", "tray"],
 
     // Modules configuration
 
-//    "hyprland/workspaces": {
-//        "disable-scroll": true,
-//        //"all-outputs": true,
-//        "on-click": "activate",
-//        "format": "{icon}",
-//        "format-icons": {
-//            "empty": "",
-//            //"default": "",
-//            "default": "",
-//            "active": "",
-//        }
-//    },
-
     "hyprland/workspaces": {
-        "format": "{name}",
-        "persistent_workspaces": {
-            "1": [],
-            "2": [],
-            "3": [],
-            "4": [],
-            "5": []
-        },
-        "all-outputs": true,
-        "active-only": false,
-        "sort-by-number": true
+        "disable-scroll": true,
+        //"all-outputs": true,
+        "on-click": "activate",
+        "format": "{icon}",
+        "format-icons": {
+            "empty": "",
+            //"default": "",
+            "default": "",
+            "active": "",
+        }
     },
+
+//    "hyprland/workspaces": {
+//        "format": "{name}",
+//        "persistent_workspaces": {
+//            "1": [],
+//            "2": [],
+//            "3": [],
+//            "4": [],
+//            "5": []
+//        },
+//        "all-outputs": true,
+//        "active-only": false,
+//        "sort-by-number": true
+//    },
     "keyboard-state": {
         "numlock": false,
         "capslock": false,
@@ -93,7 +93,6 @@
         "bat": "BAT2"
     },
     "network": {
-        "interface": "wlo1", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ",
         "format-ethernet": "{ipaddr}/{cidr} ",
         "tooltip-format": "{ifname} via {gwaddr} ",
@@ -149,6 +148,13 @@
         },
         "exec-if": "which waybar-updates",
         "exec": "waybar-updates --interval-seconds 5 --network-interval-seconds 300"
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
     }
 }