diff --git a/config.yaml b/config.yaml
index c46a4c86..6cecc98b 100644
--- a/config.yaml
+++ b/config.yaml
@@ -30,7 +30,7 @@ dotfiles:
     src: .config/nvim/init.lua
   d_nvim_lua:
     actions:
-      - nvim-packer-install
+    - nvim-packer-install
     dst: ~/.config/nvim/lua
     src: .config/nvim/lua
   d_nvim_scripts:
@@ -165,107 +165,115 @@ dotfiles:
   f_gpg-agent.conf:
     src: .gnupg/gpg-agent.conf
     dst: ~/.gnupg/gpg-agent.conf
-    chmod: "600"
+    chmod: '600'
   f_gpg.conf:
     src: .gnupg/gpg.conf
     dst: ~/.gnupg/gpg.conf
+  f_electron-flags.conf:
+    src: .config/electron-flags.conf
+    dst: ~/.config/electron-flags.conf
+  f_electron12-flags.conf:
+    src: .config/electron12-flags.conf
+    dst: ~/.config/electron12-flags.conf
 profiles:
   base:
     dotfiles:
-      - d_systemd
+    - d_systemd
   terminal:
     dotfiles:
-      - f_nvimpager
-      - f_hushlogin
-      - f_ripgrep_ignore
-      - f_ranger_commands.py
-      - f_rtv.cfg
-      - f_mailcap
-      - d_zsh
-      - f_zshrc
-      - f_tmux.conf
-      - f_ranger.conf
-      - f_ssh.conf
-      - f_authorized_keys
-      - d_nvim_lua
-      - d_nvim_scripts
-      - f_nvim_init
-      - f_gitconfig
-      - f_alacritty.yml
+    - f_nvimpager
+    - f_hushlogin
+    - f_ripgrep_ignore
+    - f_ranger_commands.py
+    - f_rtv.cfg
+    - f_mailcap
+    - d_zsh
+    - f_zshrc
+    - f_tmux.conf
+    - f_ranger.conf
+    - f_ssh.conf
+    - f_authorized_keys
+    - d_nvim_lua
+    - d_nvim_scripts
+    - f_nvim_init
+    - f_gitconfig
+    - f_alacritty.yml
   email:
     dotfiles:
-      - d_neomutt
-      - d_imapnotify
-      - f_mbsyncrc
-      - f_msmtp_config
+    - d_neomutt
+    - d_imapnotify
+    - f_mbsyncrc
+    - f_msmtp_config
   media:
     dotfiles:
-      - f_beets_config
-      - f_beets_whitelist
-      - f_abcde.conf
-      - d_mpv
-      - f_youtube-dl_config
-      - f_mpd.conf
-      - f_ncmpcpp_bindings
-      - f_ncmpcpp.conf
-      - f_libra_config
-      - f_mpdscribble.conf
-      - f_mpdris2.conf
+    - f_beets_config
+    - f_beets_whitelist
+    - f_abcde.conf
+    - d_mpv
+    - f_youtube-dl_config
+    - f_mpd.conf
+    - f_ncmpcpp_bindings
+    - f_ncmpcpp.conf
+    - f_libra_config
+    - f_mpdscribble.conf
+    - f_mpdris2.conf
   sway:
     dotfiles:
-      - d_sway
-      - d_waybar
-      - d_wofi
-      - f_mako_config
-      - f_redshift.conf
-      - f_zathurarc
-      - f_mimeo_associations.txt
-      - f_tdesktop_lang.strings
-      - f_fonts.conf
-      - f_zprofile
+    - d_sway
+    - d_waybar
+    - d_wofi
+    - f_mako_config
+    - f_redshift.conf
+    - f_zathurarc
+    - f_mimeo_associations.txt
+    - f_tdesktop_lang.strings
+    - f_fonts.conf
+    - f_zprofile
   Pacman:
     dotfiles:
-      - f_makepkg.conf
-      - f_paru.conf
+    - f_makepkg.conf
+    - f_paru.conf
   Mirkwood:
     include:
-      - base
-      - terminal
-      - email
-      - media
-      - sway
-      - Pacman
+    - base
+    - terminal
+    - email
+    - media
+    - sway
+    - Pacman
     dotfiles:
-      - f_paru.conf
-      - f_user-dirs.dirs
-      - f_gitconfig
-      - f_foot.ini
-      - f_gpg-agent.conf
-      - f_gpg.conf
+    - f_paru.conf
+    - f_user-dirs.dirs
+    - f_gitconfig
+    - f_foot.ini
+    - f_gpg-agent.conf
+    - f_gpg.conf
+    - f_electron-flags.conf
+    - f_electron12-flags.conf
   Moria:
     include:
-      - terminal
-      - media
-      - Pacman
+    - terminal
+    - media
+    - Pacman
   Gondor:
     include:
-      - terminal
-      - Pacman
+    - terminal
+    - Pacman
   mko-laptop:
     include:
-      - terminal
-      - media
+    - terminal
+    - media
   Edoras:
     include:
-      - terminal
-      - Pacman
+    - terminal
+    - Pacman
   TakamakiPC:
     include:
-      - terminal
-      - Pacman
+    - terminal
+    - Pacman
   localhost:
     include:
-      - terminal
+    - terminal
   ViiruJaTeippi:
     include:
-      - terminal
+    - terminal
diff --git a/home/.config/electron-flags.conf b/home/.config/electron-flags.conf
new file mode 100644
index 00000000..51bdd86f
--- /dev/null
+++ b/home/.config/electron-flags.conf
@@ -0,0 +1,2 @@
+--enable-features=UseOzonePlatform
+--ozone-platform=wayland
diff --git a/home/.config/electron12-flags.conf b/home/.config/electron12-flags.conf
new file mode 100644
index 00000000..51bdd86f
--- /dev/null
+++ b/home/.config/electron12-flags.conf
@@ -0,0 +1,2 @@
+--enable-features=UseOzonePlatform
+--ozone-platform=wayland
diff --git a/root/usr/local/bin/sway-run b/root/usr/local/bin/sway-run
index 8009f18f..ac015c91 100755
--- a/root/usr/local/bin/sway-run
+++ b/root/usr/local/bin/sway-run
@@ -21,6 +21,9 @@ export QT_QPA_PLATFORMTHEME=qt5ct
 export QT_QPA_PLATFORM=wayland
 export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
 
+# Enable wayland support on clutter
+export CLUTTER_BACKEND=wayland
+
 # Fix redshift on wlroots
 export WLR_DRM_NO_ATOMIC=1
 
@@ -37,5 +40,6 @@ unset _JAVA_OPTIONS
 unset QT_QPA_PLATFORMTHEME
 unset QT_QPA_PLATFORM
 unset QT_WAYLAND_DISABLE_WINDOWDECORATION
+unset CLUTTER_BACKEND
 unset WLR_DRM_NO_ATOMIC
 unset XDG_CURRENT_DESKTOP