diff --git a/.dotter/global.toml b/.dotter/global.toml
index 8354872..91826df 100644
--- a/.dotter/global.toml
+++ b/.dotter/global.toml
@@ -1,52 +1,43 @@
 [settings]
-  default_target_type = "symbolic"
+default_target_type = "symbolic"
 
 [helpers]
 
 [default]
-  depends = [ "niri" ]
+depends = ["niri"]
 
-  [default.files]
-    "configs/containers" = "~/.config/containers"
-    "configs/mpv"        = "~/.config/mpv"
-    "configs/swappy"     = "~/.config/swappy"
+[default.files]
+"configs/fish" = "~/.config/fish"
+"configs/alacritty" = "~/.config/alacritty"
+"configs/atuin" = "~/.config/atuin"
+"configs/bat" = "~/.config/bat"
+"configs/containers" = "~/.config/containers"
+"configs/fzf" = "~/.config/fzf"
+"configs/ghostty" = "~/.config/ghostty"
+"configs/git" = "~/.config/git"
+"configs/hypr/base" = "~/.config/hypr"
+"configs/kitty" = "~/.config/kitty"
+"configs/lazygit" = "~/.config/lazygit"
+"configs/mako" = "~/.config/mako"
+"configs/mise" = "~/.config/mise"
+"configs/mpv" = "~/.config/mpv"
+"configs/nvim" = "~/.config/nvim"
+"configs/rofi" = "~/.config/rofi"
+"configs/swappy" = "~/.config/swappy"
+"configs/swaync" = "~/.config/swaync"
+"configs/uwsm" = "~/.config/uwsm"
+"configs/vimiv" = "~/.config/vimiv"
+"configs/waybar" = "~/.config/waybar"
+"configs/wezterm" = "~/.config/wezterm"
+"configs/wlogout" = "~/.config/wlogout"
+"configs/wpaperd" = "~/.config/wpaperd"
+"configs/yazi" = "~/.config/yazi"
+"configs/systemd" = "~/.config/systemd"
+"configs/zed" = "~/.config/zed"
 
-  [default.variables]
 
-[wm.files]
-  "configs/mako"   = "~/.config/mako"
-  "configs/swaync" = "~/.config/swaync"
-  "configs/uwsm"   = "~/.config/uwsm"
-  "configs/vimiv"  = "~/.config/vimiv"
+[default.variables]
 
 [niri.files]
-  "configs/niri/base" = "~/.config/niri"
-  "configs/noctalia"  = "~/.config/noctalia"
-
-[hyprland.files]
-  "configs/hypr/base" = "~/.config/hypr"
-
-[wayland-composed.files]
-  "configs/rofi"    = "~/.config/rofi"
-  "configs/waybar"  = "~/.config/waybar"
-  "configs/wlogout" = "~/.config/wlogout"
-  "configs/wpaperd" = "~/.config/wpaperd"
-
-
-[shell.files]
-  "configs/alacritty" = "~/.config/alacritty"
-  "configs/atuin"     = "~/.config/atuin"
-  "configs/bat"       = "~/.config/bat"
-  "configs/fish"      = "~/.config/fish"
-  "configs/fzf"       = "~/.config/fzf"
-  "configs/ghostty"   = "~/.config/ghostty"
-  "configs/git"       = "~/.config/git"
-  "configs/kitty"     = "~/.config/kitty"
-  "configs/lazygit"   = "~/.config/lazygit"
-  "configs/wezterm"   = "~/.config/wezterm"
-  "configs/yazi"      = "~/.config/yazi"
-
-[dev.files]
-  "configs/mise" = "~/.config/mise"
-  "configs/nvim" = "~/.config/nvim"
-  "configs/zed"  = "~/.config/zed"
+"configs/niri/base" = "~/.config/niri"
+"configs/noctalia" = "~/.config/noctalia"
diff --git a/.taplo.toml b/.taplo.toml
index e3baee1..19cac95 100644
--- a/.taplo.toml
+++ b/.taplo.toml
@@ -1,12 +1,3 @@
 [formatting]
-inline_table_expand   = false
-array_auto_expand     = false
-align_entries         = true
-align_comments        = true
-array_auto_collapse   = false
-compact_arrays        = false
-compact_inline_tables = false
-indent_tables         = true
-indent_entries        = true
-reorder_keys          = true
-reorder_inline_tables = true
+inline_table_expand = false
+array_auto_expand = false