diff --git a/dot_config/btop/btop.conf.tmpl b/dot_config/btop/btop.conf
similarity index 87%
rename from dot_config/btop/btop.conf.tmpl
rename to dot_config/btop/btop.conf
index 204eb0a..86846c1 100644
--- a/dot_config/btop/btop.conf.tmpl
+++ b/dot_config/btop/btop.conf
@@ -1,15 +1,8 @@
-#? Config file for btop v. 1.2.13
+#? Config file for btop v. 1.4.0
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
-
-{{ if eq .chezmoi.os "darwin" -}}
-# macOS .bashrc contents
-color_theme = "/opt/homebrew/Cellar/btop/1.2.13/share/btop/themes/flat-remix.theme"
-{{ else if eq .chezmoi.os "linux" -}}
-# Linux .bashrc contents
 color_theme = "/usr/share/btop/themes/flat-remix.theme"
-{{ end -}}
 
 #* If the theme set background should be shown, set to False if you want terminal background transparency.
 theme_background = True
@@ -44,6 +37,9 @@ graph_symbol = "braille"
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_cpu = "default"
 
+# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty".
+graph_symbol_gpu = "default"
+
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_mem = "default"
 
@@ -53,7 +49,7 @@ graph_symbol_net = "default"
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_proc = "default"
 
-#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace.
+#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
 shown_boxes = "cpu mem net proc"
 
 #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
@@ -93,6 +89,9 @@ proc_left = False
 #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
 proc_filter_kernel = False
 
+#* In tree-view, always accumulate child process resources in the parent process.
+proc_aggregate = False
+
 #* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
 #* Select from a list of detected attributes from the options menu.
 cpu_graph_upper = "total"
@@ -101,6 +100,9 @@ cpu_graph_upper = "total"
 #* Select from a list of detected attributes from the options menu.
 cpu_graph_lower = "total"
 
+#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off".
+show_gpu_info = "Auto"
+
 #* Toggles if the lower CPU graph should be inverted.
 cpu_invert_lower = True
 
@@ -214,6 +216,33 @@ show_battery = True
 #* Which battery to use if multiple are present. "Auto" for auto detection.
 selected_battery = "Auto"
 
+#* Show power stats of battery next to charge indicator.
+show_battery_watts = True
+
 #* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
 #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
 log_level = "WARNING"
+
+#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
+nvml_measure_pcie_speeds = True
+
+#* Horizontally mirror the GPU graph.
+gpu_mirror_graph = True
+
+#* Custom gpu0 model name, empty string to disable.
+custom_gpu_name0 = ""
+
+#* Custom gpu1 model name, empty string to disable.
+custom_gpu_name1 = ""
+
+#* Custom gpu2 model name, empty string to disable.
+custom_gpu_name2 = ""
+
+#* Custom gpu3 model name, empty string to disable.
+custom_gpu_name3 = ""
+
+#* Custom gpu4 model name, empty string to disable.
+custom_gpu_name4 = ""
+
+#* Custom gpu5 model name, empty string to disable.
+custom_gpu_name5 = ""
diff --git a/dot_config/gtk-3.0/gtk.css b/dot_config/gtk-3.0/gtk.css
index 0807566..7b73797 100644
--- a/dot_config/gtk-3.0/gtk.css
+++ b/dot_config/gtk-3.0/gtk.css
@@ -13,3 +13,4 @@ decoration {
 decoration:backdrop {
 	box-shadow: none;
 }
+@import 'colors.css';
\ No newline at end of file
diff --git a/dot_config/hypr/hyprpaper.conf b/dot_config/hypr/hyprpaper.conf
new file mode 100644
index 0000000..a4ab09d
--- /dev/null
+++ b/dot_config/hypr/hyprpaper.conf
@@ -0,0 +1,3 @@
+preload = $HOME/wallpaper/your-name-anime-1920x1080-14877.jpeg
+wallpaper = ,$HOME/wallpaper/your-name-anime-1920x1080-14877.jpeg
+splash = false
diff --git a/dot_config/hypr/monitors.conf.tmpl b/dot_config/hypr/monitors.conf.tmpl
index 05ff6bf..e6700f7 100644
--- a/dot_config/hypr/monitors.conf.tmpl
+++ b/dot_config/hypr/monitors.conf.tmpl
@@ -4,6 +4,7 @@
 
 monitor=,preferred,auto,auto
 
+# machine-specific configuration
 {{- if eq .chezmoi.hostname "sri-laptop-fedora" }}
 monitor = DVI-I-2, 1920x1080, 0x0, 1
 monitor = DVI-I-1, 1920x1080, 1920x0, 1
diff --git a/dot_config/hypr/programs.conf b/dot_config/hypr/programs.conf.tmpl
similarity index 80%
rename from dot_config/hypr/programs.conf
rename to dot_config/hypr/programs.conf.tmpl
index 3db5c06..3b4c0e7 100644
--- a/dot_config/hypr/programs.conf
+++ b/dot_config/hypr/programs.conf.tmpl
@@ -26,3 +26,8 @@ exec-once = waybar & hyprpaper & firefox
 exec-once = wl-paste --type text --watch cliphist store # Stores only text data
 
 exec-once = wl-paste --type image --watch cliphist store # Stores only image data
+
+# machine-specific configuration
+{{- if eq .chezmoi.hostname "sri-laptop-fedora" }}
+exec-once = flatpak run com.github.IsmaelMartinez.teams_for_linux
+{{- end }}
diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf
index 5c97a91..9be18bd 100644
--- a/dot_config/kitty/kitty.conf
+++ b/dot_config/kitty/kitty.conf
@@ -11,7 +11,7 @@ font_size 13.0
 cursor_trail 1
 
 # Themes can override any settings in this file
-include theme.conf
+#include theme.conf
 #background_opacity 0.60
 #hide_window_decorations yes
 #confirm_os_window_close 0
diff --git a/dot_config/mimeapps.list b/dot_config/mimeapps.list
index 2fc1257..47a3e8d 100644
--- a/dot_config/mimeapps.list
+++ b/dot_config/mimeapps.list
@@ -22,6 +22,8 @@ application/rss+xml=userapp-Thunderbird-4BW691.desktop;
 application/x-extension-rss=userapp-Thunderbird-4BW691.desktop;
 x-scheme-handler/webcal=userapp-Thunderbird-6HQ691.desktop;
 x-scheme-handler/webcals=userapp-Thunderbird-6HQ691.desktop;
+x-scheme-handler/jetbrains=jetbrains-toolbox.desktop;
+text/plain=code.desktop
 
 [Default Applications]
 text/html=firefox.desktop
@@ -51,3 +53,4 @@ text/calendar=userapp-Thunderbird-6HQ691.desktop
 application/x-extension-ics=userapp-Thunderbird-6HQ691.desktop
 x-scheme-handler/webcals=userapp-Thunderbird-6HQ691.desktop
 x-scheme-handler/jetbrains=jetbrains-toolbox.desktop
+text/plain=code.desktop
diff --git a/desktop-bilder/background.jpg b/wallpaper/background.jpg
similarity index 100%
rename from desktop-bilder/background.jpg
rename to wallpaper/background.jpg
diff --git a/desktop-bilder/bluescreen.jpg b/wallpaper/bluescreen.jpg
similarity index 100%
rename from desktop-bilder/bluescreen.jpg
rename to wallpaper/bluescreen.jpg
diff --git a/desktop-bilder/bluescreen.png b/wallpaper/bluescreen.png
similarity index 100%
rename from desktop-bilder/bluescreen.png
rename to wallpaper/bluescreen.png
diff --git a/desktop-bilder/bluescreen_full-hd.png b/wallpaper/bluescreen_full-hd.png
similarity index 100%
rename from desktop-bilder/bluescreen_full-hd.png
rename to wallpaper/bluescreen_full-hd.png
diff --git a/wallpaper/your-name-anime-1920x1080-14877.jpeg b/wallpaper/your-name-anime-1920x1080-14877.jpeg
new file mode 100644
index 0000000..0bd38f8
Binary files /dev/null and b/wallpaper/your-name-anime-1920x1080-14877.jpeg differ