diff --git a/config-home.yaml b/config-home.yaml
index 130be67..b431b65 100644
--- a/config-home.yaml
+++ b/config-home.yaml
@@ -1,6 +1,5 @@
 actions:
   vim-plug: nvim +PlugInstall +qall
-  zplug: zplug install
 config:
   backup: true
   banner: true
@@ -20,20 +19,26 @@ dotfiles:
   d_mpv:
     dst: ~/.config/mpv
     src: .config/mpv
+  d_environment:
+    dst: ~/.config/environment.d
+    src: .config/environment.d
+  f_init.vim:
+    dst: ~/.config/nvim/init.vim
+    src: .config/nvim/init.vim
   d_nvim_config:
     actions:
       - vim-plug
     dst: ~/.config/nvim/conf.d
     src: .config/nvim/conf.d
+  f_coc-settings.json:
+    dst: ~/.config/nvim/coc-settings.json
+    src: .config/nvim/coc-settings.json
   d_scripts:
     dst: ~/Scripts
     src: Scripts
   d_sway:
     dst: ~/.config/sway
     src: .config/sway
-  d_ticons:
-    dst: ~/.local/share/TelegramDesktop/tdata/ticons
-    src: .local/share/TelegramDesktop/tdata/ticons
   d_waybar:
     dst: ~/.config/waybar
     src: .config/waybar
@@ -58,15 +63,9 @@ dotfiles:
   f_bspwmrc:
     dst: ~/.config/bspwm/bspwmrc
     src: .config/bspwm/bspwmrc
-  f_coc-settings.json:
-    dst: ~/.config/nvim/coc-settings.json
-    src: .config/nvim/coc-settings.json
   f_gitconfig:
     dst: ~/.gitconfig
     src: .gitconfig
-  f_init.vim:
-    dst: ~/.config/nvim/init.vim
-    src: .config/nvim/init.vim
   f_libra_config:
     dst: ~/.config/libra/config.toml
     src: .config/libra/config.toml
@@ -124,9 +123,6 @@ dotfiles:
   f_youtube-dl_config:
     dst: ~/.config/youtube-dl/config
     src: .config/youtube-dl/config
-  f_youtube-viewer.conf:
-    dst: ~/.config/youtube-viewer/youtube-viewer.conf
-    src: .config/youtube-viewer/youtube-viewer.conf
   f_zathurarc:
     dst: ~/.config/zathura/zathurarc
     src: .config/zathura/zathurarc
@@ -142,10 +138,10 @@ dotfiles:
   f_fonts.conf:
     src: .config/fontconfig/fonts.conf
     dst: ~/.config/fontconfig/fonts.conf
-  f_ignore:
+  f_ripgrep_ignore:
     src: .ignore
     dst: ~/.ignore
-  f_nvimpager_init.vim:
+  f_nvimpager:
     src: .config/nvimpager/init.vim
     dst: ~/.config/nvimpager/init.vim
   f_ncmpcpp.conf:
@@ -171,7 +167,6 @@ profiles:
       - f_libra_config
       - f_mpdscribble.conf
       - f_mpdris2.conf
-      - f_youtube-viewer.conf
   Sway:
     dotfiles:
       - d_sway
@@ -195,9 +190,6 @@ profiles:
       - Media
       - Sway
       - Pacman
-  ReekyRaspberry:
-    include:
-      - Terminal
   Rivendell:
     include:
       - Terminal
@@ -210,9 +202,9 @@ profiles:
       - Pacman
   Terminal:
     dotfiles:
-      - f_nvimpager_init.vim
+      - f_nvimpager
       - f_hushlogin
-      - f_ignore
+      - f_ripgrep_ignore
       - f_ranger_commands.py
       - f_rtv.cfg
       - f_mailcap
diff --git a/config-root.yaml b/config-root.yaml
index a35e1b2..b2bf0ce 100644
--- a/config-root.yaml
+++ b/config-root.yaml
@@ -39,9 +39,6 @@ dotfiles:
   f_detected.sh:
     dst: /etc/clamav/detected.sh
     src: etc/clamav/detected.sh
-  f_environment:
-    dst: /etc/environment
-    src: etc/environment
   f_freetype2.sh:
     dst: /etc/profile.d/freetype2.sh
     src: etc/profile.d/freetype2.sh
@@ -155,7 +152,6 @@ profiles:
   Mirkwood:
     dotfiles:
       - f_getty.conf
-      - f_environment
       - f_cryptissue
       - f_welcomemessage.conf
       - d_bin
diff --git a/home/.config/environment.d/firefox.conf b/home/.config/environment.d/firefox.conf
new file mode 100644
index 0000000..a882e76
--- /dev/null
+++ b/home/.config/environment.d/firefox.conf
@@ -0,0 +1,3 @@
+MOZ_ENABLE_WAYLAND=1
+MOZ_USE_XINPUT2=1
+MOZ_WEBRENDER=1
diff --git a/home/.config/environment.d/java.conf b/home/.config/environment.d/java.conf
deleted file mode 100644
index ccb1305..0000000
--- a/home/.config/environment.d/java.conf
+++ /dev/null
@@ -1,3 +0,0 @@
- _JAVA_AWT_WM_NONREPARENTING=1
- _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
- JAVA_FONTS=/usr/share/fonts/TTF
diff --git a/root/etc/environment b/home/.config/environment.d/sway.conf
old mode 100755
new mode 100644
similarity index 86%
rename from root/etc/environment
rename to home/.config/environment.d/sway.conf
index 5aa0118..449de9b
--- a/root/etc/environment
+++ b/home/.config/environment.d/sway.conf
@@ -7,11 +7,6 @@ QT_QPA_PLATFORMTHEME=qt5ct
 QT_QPA_PLATFORM=wayland-egl
 QT_WAYLAND_DISABLE_WINDOWDECORATION=1
 
-# Firefox
-MOZ_ENABLE_WAYLAND=1
-MOZ_USE_XINPUT2=1
-MOZ_WEBRENDER=1
-
 # Fix redshift on wlroots
 WLR_DRM_NO_ATOMIC=1