diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index f05beb9..93d86ae 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -18,31 +18,7 @@ set -x PAGER less
 #}}}
 # start window manager if using tty1 {{{
 #
-    function esway
-        clear
-        # export XDG_CURRENT_DESKTOP=Unity
-        export QT_SCALE_FACTOR=1
-        export QPA_PLATFORM=wayland
-        export QT_QPA_PLATFORM=wayland
-        exec sway
-    end
-    function ei3
-        clear
-        exec startx i3
-    end
-    if test "$XDG_VTNR" = 1 -a -z "$DISPLAY" #faster like this
-        if command -v systemctl -a systemctl -q is-active graphical.target 
-            export _JAVA_AWT_WM_NONREPARENTING=1
-            export GTK_CSD=0
-            export LD_PRELOAD=/usr/lib/libgtk3-nocsd.so.0
-            export XCURSOR_THEME=capitaine-cursors
-            export GTK_THEME=materia-custom-accent:dark
-
-            esway > .swaylog
-            # ei3 > .i3log
-        end
-    end
-
+    sh ~/.local/bin/etwm
 # }}}
 # use tmux{{{
 set TMUX 1
diff --git a/scripts/.local/bin/etwm b/scripts/.local/bin/etwm
new file mode 100755
index 0000000..4b66558
--- /dev/null
+++ b/scripts/.local/bin/etwm
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+esway() {
+    clear
+    # export XDG_CURRENT_DESKTOP=Unity
+    export QT_SCALE_FACTOR=1
+    export QPA_PLATFORM=wayland
+    export QT_QPA_PLATFORM=wayland
+    exec sway
+}
+ei3() {
+    clear
+    exec startx /usr/bin/i3
+}
+ebsp(){
+    clear
+    exec startx /usr/bin/bspwm
+}
+
+if [ "$XDG_VTNR" = 1 ] && [ -z "$DISPLAY" ] && systemctl -q is-active graphical.target 
+then
+    [ -f /etc/X11/xinit/xinitrc.d/30-gtk3-nocsd.sh ] &&
+        source /etc/X11/xinit/xinitrc.d/30-gtk3-nocsd.sh
+
+    export _JAVA_AWT_WM_NONREPARENTING=1
+    export _JAVA_OPTIONS='-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
+    export XCURSOR_THEME=capitaine-cursors
+    export GTK_THEME=materia-custom-accent:dark
+
+    # esway &> .swaylog
+    ei3 &> .i3log
+    # ebsp &> .bsplog
+fi
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 923558e..9bcf2b8 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -34,41 +34,7 @@ export PAGER=less
     fi
 # }}}
 # start sway if using tty1 {{{
-#
-    esway() {
-        clear
-        # export XDG_CURRENT_DESKTOP=Unity
-        export QT_SCALE_FACTOR=1
-        export QPA_PLATFORM=wayland
-        export QT_QPA_PLATFORM=wayland
-        exec sway
-    }
-    ei3() {
-        clear
-        exec startx /usr/bin/i3
-    }
-    ebsp(){
-        clear
-        exec startx /usr/bin/bspwm
-    }
-    if [[ $XDG_VTNR -eq 1 ]] #faster like this
-    then
-        if systemctl -q is-active graphical.target && [[ -z "$DISPLAY" ]]
-        then
-            [ -f /etc/X11/xinit/xinitrc.d/30-gtk3-nocsd.sh ] &&
-                source /etc/X11/xinit/xinitrc.d/30-gtk3-nocsd.sh
-
-            export _JAVA_AWT_WM_NONREPARENTING=1
-            export _JAVA_OPTIONS='-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
-            export XCURSOR_THEME=capitaine-cursors
-            export GTK_THEME=materia-custom-accent:dark
-
-            esway &> .swaylog
-            # ei3 &> .i3log
-            # ebsp &> .bsplog
-        fi
-    fi
-
+    sh ~/.local/bin/etwm
 # }}}
 # use tmux{{{
 
@@ -282,5 +248,3 @@ preexec() { echo -ne '\e[5 q' ;}
     setopt GLOBSTARSHORT
 #}}}
 # vim:foldmethod=marker
-
-source /home/lelgenio/.config/broot/launcher/bash/br