diff --git a/.config/sway/config b/.config/sway/config
index 11c8367..5e60407 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -10,48 +10,51 @@ set {
     $up k
     $right l
     $term kitty
-    $menu rofi -show drun -icon-theme "Papirus-Dark" -show-icons | xargs swaymsg exec --
-    $windowmenu rofi -show window -icon-theme "Papirus-Dark" -show-icons
+    #$menu rofi -show drun -icon-theme "Papirus-Dark" -show-icons | xargs swaymsg exec --
+    $menu wofi --show drun | xargs swaymsg exec --
+    $runmenu wofi --show run | xargs swaymsg exec --
     $gnome-schema org.gnome.desktop.interface
     $gtk_theme "Adapta-Nokto-Eta"
     $icon_theme "Papirus-Dark"
-    $bg ~/Pictures/drain.png
-    $lockscreen exec '~/.local/bin/lockscreen'
+    $bg ~/Pictures/drain.jpg
+    #$lockscreen exec '~/.local/bin/lockscreen'
+    $lockscreen 'swaylock --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 10 --effect-blur 7x5 --effect-vignette 0.4:0.4 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2'
     # Heads
-    # For desktop
-    $primary DP-1
-    $portrait DVI-D-1
-    # For dankpad
-    #$primary LVDS-1
-    # For thonkpad
-    #$primary eDP-1
+    $primary eDP-1
 }
 
 #
 ### Autoruns
 #
 exec_always --no-startup-id {
+    pkill flashfocus
     gsettings set $gnome-schema gtk-theme $gtk_theme
     gsettings set $gnome-schema icon-theme $icon_theme
-    mako --anchor bottom-right > /tmp/mako.log 2>&1
+    gsettings set $gnome-schema font-name 'Cantarell 10'
+    gsettings set $gnome-schema monospace-font-name 'Anka/Coder 11'
+    mako --anchor top-right > /tmp/mako.log 2>&1
+    flashfocus
+    evolution
+    telegram-desktop
     swaymsg focus output $primary
-    swayidle -w timeout 1200 "$lockscreen"\
+    swaymsg input 2:7:SynPS/2_Synaptics_TouchPad events disabled
+    swayidle -w timeout 1200 exec $lockscreen\
         timeout 1201 'swaymsg "output * dpms off"'\
         resume 'swaymsg "output * dpms on"'\
-        before-sleep "$lockscreen"
+        before-sleep exec $lockscreen
 }
 
 #
 ### Output configuration
 #
 # For desktop
-output $primary pos 1050 200 res 1920x1200
-output $portrait pos 0 0 res 1680x1050
-output $portrait transform 270
+#output $primary pos 1050 200 res 1920x1200
+#output $portrait pos 0 0 res 1680x1050
+#output $portrait transform 270
 # For dankpad
 #output $primary pos 0 0 res 1600x900
 # For thonkpad
-#output $primary pos 0 0 res 1920x1080
+output $primary pos 0 0 res 1920x1080
 
 # Set desktop background for all heads
 output * bg $bg fill
@@ -69,7 +72,7 @@ output * bg $bg fill
 
     # Start your launcher
     bindsym $mod+d exec $menu
-    bindsym $mod+shift+d exec $windowmenu
+    bindsym $mod+shift+d exec $runmenu
 
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
@@ -85,7 +88,7 @@ output * bg $bg fill
     bindsym $mod+Shift+e exec swaynag -t warning -m 'Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
 
     #Lock the session
-    bindsym Control+Shift+l $lockscreen
+    bindsym Control+Shift+l exec $lockscreen
 
 #
 # Program shortcuts
@@ -108,6 +111,10 @@ bindsym {
     bindsym $mod+Up focus up
     bindsym $mod+Right focus right
 
+    bindsym $mod+comma workspace prev_on_output
+    bindsym $mod+period workspace next_on_output
+    bindsym $mod+tab workspace back_and_forth
+
     # Move the focused window with the same, but add Shift
     bindsym $mod+Shift+$left move left
     bindsym $mod+Shift+$down move down
@@ -122,43 +129,20 @@ bindsym {
 # Workspaces:
 #
     # Switch to workspace
-    # For multihead with switching script
-    bindsym $mod+1 exec switchws.py 1
-    bindsym $mod+2 exec switchws.py 2
-    bindsym $mod+3 exec switchws.py 3
-    bindsym $mod+4 exec switchws.py 4
-    bindsym $mod+5 exec switchws.py 5
-    bindsym $mod+6 exec switchws.py 6
-    bindsym $mod+7 exec switchws.py 7
-    bindsym $mod+8 exec switchws.py 8
-    bindsym $mod+9 exec switchws.py 9
-    bindsym $mod+0 exec switchws.py 10
-
     # For single head configs
-    # bindsym $mod+1 workspace 1
-    # bindsym $mod+2 workspace 2
-    # bindsym $mod+3 workspace 3
-    # bindsym $mod+4 workspace 4
-    # bindsym $mod+5 workspace 5
-    # bindsym $mod+6 workspace 6
-    # bindsym $mod+7 workspace 7
-    # bindsym $mod+8 workspace 8
-    # bindsym $mod+9 workspace 9
-    # bindsym $mod+0 workspace 10
-
-    # Old manual switching for extra head
-    # bindsym $mod+Control+1 workspace P1
-    # bindsym $mod+Control+2 workspace P2
-    # bindsym $mod+Control+3 workspace P3
-    # bindsym $mod+Control+4 workspace P4
-    # bindsym $mod+Control+5 workspace P5
-    # bindsym $mod+Control+6 workspace P6
-    # bindsym $mod+Control+7 workspace P7
-    # bindsym $mod+Control+8 workspace P8
-    # bindsym $mod+Control+9 workspace P9
-    # bindsym $mod+Control+0 workspace P10
+    bindsym $mod+1 workspace 1
+    bindsym $mod+2 workspace 2
+    bindsym $mod+3 workspace 3
+    bindsym $mod+4 workspace 4
+    bindsym $mod+5 workspace 5
+    bindsym $mod+6 workspace 6
+    bindsym $mod+7 workspace 7
+    bindsym $mod+8 workspace 8
+    bindsym $mod+9 workspace 9
+    bindsym $mod+0 workspace 10
 
     bindsym $mod+t workspace comm
+    bindsym $mod+m workspace M
 
     # Move focused container to workspace
     bindsym $mod+Shift+1 move container to workspace 1
@@ -171,28 +155,8 @@ bindsym {
     bindsym $mod+Shift+8 move container to workspace 8
     bindsym $mod+Shift+9 move container to workspace 9
     bindsym $mod+Shift+0 move container to workspace 10
-    bindsym $mod+Shift+Control+1 move container to workspace P1
-    bindsym $mod+Shift+Control+2 move container to workspace P2
-    bindsym $mod+Shift+Control+3 move container to workspace P3
-    bindsym $mod+Shift+Control+4 move container to workspace P4
-    bindsym $mod+Shift+Control+5 move container to workspace P5
-    bindsym $mod+Shift+Control+6 move container to workspace P6
-    bindsym $mod+Shift+Control+7 move container to workspace P7
-    bindsym $mod+Shift+Control+8 move container to workspace P8
-    bindsym $mod+Shift+Control+9 move container to workspace P9
-    bindsym $mod+Shift+Control+0 move container to workspace P10
+
     # Workspace-monitor assignments
-    workspace P1 output $portrait
-    workspace P2 output $portrait
-    workspace P3 output $portrait
-    workspace P4 output $portrait
-    workspace P5 output $portrait
-    workspace P6 output $portrait
-    workspace P7 output $portrait
-    workspace P8 output $portrait
-    workspace P9 output $portrait
-    workspace P10 output $portrait
-    workspace comm output $portrait
     # For single head devices
     #workspace comm output $primary
     workspace 1 output $primary
@@ -205,11 +169,16 @@ bindsym {
     workspace 8 output $primary
     workspace 9 output $primary
     workspace 10 output $primary
+    workspace comm output $primary
+    workspace M output $primary
+    workspace net output $primary
 
 # Assign programs to workspaces
 
 assign [app_id="evolution"] comm
 assign [instance="telegram-desktop"] comm
+assign [title="nmtui"] net
+
 #
 # Layout stuff:
 #
@@ -239,7 +208,7 @@ assign [instance="telegram-desktop"] comm
 #
 # Media keys and screenshots
 #
-
+    bindsym XF86PowerOff exec systemctl suspend
     bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
     bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
     bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
@@ -289,8 +258,20 @@ bindsym $mod+r mode "resize"
 #
 ### Input
 #
+input 1:1:AT_Translated_Set_2_keyboard {
+    xkb_options caps:escape
+}
+
+input 2:7:SynPS/2_Synaptics_TouchPad {
+    tap enabled
+    natural_scroll enabled
+    scroll_method two_finger
+}
+
+bindsym XF86LaunchA exec toggle_touchpad.py
+
 focus_follows_mouse yes
-focus_wrapping false
+focus_wrapping yes
 popup_during_fullscreen leave_fullscreen
 focus_on_window_activation focus
 
@@ -305,7 +286,7 @@ gaps outer 4
 # Title Bar
 #
 titlebar_padding 1
-font "Cantarell 8"
+font "Cantarell 10"
 #
 # Font
 #
@@ -319,10 +300,13 @@ default_floating_border pixel 2
 # Status Bar:
 #
 bar {
-    position top
     swaybar_command waybar
 }
 #
+# Window settings
+#
+for_window [class="Brave-browser"] inhibit_idle focus; layout tabbed
+#
 # Floating windows
 #
 for_window [class="pop-up"]     floating enable; border normal $border
@@ -334,6 +318,15 @@ for_window [title="ImageMagick.*"] {
     border normal $border
     title_format " %title"
 }
+#for_window [title="nmtui"] {
+#    border normal $border
+#    resize set width 882
+#    resize set height 600
+#    floating enable
+#}
+for_window [class="TelegramDesktop"] {
+    resize set width 600px
+}
 for_window [app_id="nm-connection-editor"] {
     floating enable
     resize set width  882px