diff --git a/symlinks/config/JetBrains/.gitignore b/symlinks/config/JetBrains/.gitignore
index a56b60a..0992e4b 100644
--- a/symlinks/config/JetBrains/.gitignore
+++ b/symlinks/config/JetBrains/.gitignore
@@ -15,3 +15,5 @@
 **/options/window.state.xml
 **/options/*statistics.xml
 **/options/*local.xml
+**/port
+**/extensions
diff --git a/symlinks/config/JetBrains/IdeaIC2020.3/options/filetypes.xml b/symlinks/config/JetBrains/IdeaIC2020.3/options/filetypes.xml
index c023d7c..e88c394 100644
--- a/symlinks/config/JetBrains/IdeaIC2020.3/options/filetypes.xml
+++ b/symlinks/config/JetBrains/IdeaIC2020.3/options/filetypes.xml
@@ -1,6 +1,7 @@
 <application>
   <component name="FileTypeManager" version="18">
     <extensionMap>
+      <mapping ext="main.kts" type="Kotlin" />
       <removed_mapping ext="apk" approved="true" type="ARCHIVE" />
       <removed_mapping ext="psd" approved="true" type="Image" />
     </extensionMap>
diff --git a/symlinks/config/JetBrains/IdeaIC2020.3/options/pluginAdvertiser.xml b/symlinks/config/JetBrains/IdeaIC2020.3/options/pluginAdvertiser.xml
index bd0acdf..c56c80b 100644
--- a/symlinks/config/JetBrains/IdeaIC2020.3/options/pluginAdvertiser.xml
+++ b/symlinks/config/JetBrains/IdeaIC2020.3/options/pluginAdvertiser.xml
@@ -119,6 +119,15 @@
             </plugin>
           </value>
         </entry>
+        <entry key="*.config">
+          <value>
+            <plugin>
+              <option name="myPluginId" value="Lombook Plugin" />
+              <option name="myPluginName" value="Lombok" />
+              <option name="myBundled" value="true" />
+            </plugin>
+          </value>
+        </entry>
         <entry key="*.cvp">
           <value>
             <plugin>
@@ -1217,6 +1226,15 @@
             </plugin>
           </value>
         </entry>
+        <entry key="lombok.config">
+          <value>
+            <plugin>
+              <option name="myPluginId" value="Lombook Plugin" />
+              <option name="myPluginName" value="Lombok" />
+              <option name="myBundled" value="true" />
+            </plugin>
+          </value>
+        </entry>
         <entry key="maven.config">
           <value>
             <plugin>
diff --git a/symlinks/config/sway/conf.d/00_mod_keys b/symlinks/config/sway/conf.d/00_mod_keys
index e479efc..92e09be 100644
--- a/symlinks/config/sway/conf.d/00_mod_keys
+++ b/symlinks/config/sway/conf.d/00_mod_keys
@@ -1,3 +1,8 @@
 # Set mod key to Meta/Windows
 set $mod Mod4
 set $alt Mod1
+
+set $left h
+set $right l
+set $down j
+set $up k
diff --git a/symlinks/config/sway/conf.d/01_default_tools b/symlinks/config/sway/conf.d/01_default_tools
index 70851f9..af6bdcb 100644
--- a/symlinks/config/sway/conf.d/01_default_tools
+++ b/symlinks/config/sway/conf.d/01_default_tools
@@ -6,7 +6,7 @@ set $processviewer $term -e htop
 
 
 # start a terminal
-bindsym $mod+t exec $term
+bindsym $mod+Return exec $term
 
 # start todoist
 bindsym $mod+$alt+t exec todoist
diff --git a/symlinks/config/sway/conf.d/02_wmkeybind b/symlinks/config/sway/conf.d/02_wmkeybind
index 0cf42e8..a396a8e 100644
--- a/symlinks/config/sway/conf.d/02_wmkeybind
+++ b/symlinks/config/sway/conf.d/02_wmkeybind
@@ -13,14 +13,26 @@ bindsym $mod+Down focus down
 bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
+# Change focus with vim keys
+bindsym $mod+$left focus left
+bindsym $mod+$down focus down
+bindsym $mod+$up focus up
+bindsym $mod+$right focus right
+
 # Move around windows with arrow keys
 bindsym $mod+Shift+Left move left
 bindsym $mod+Shift+Down move down
 bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
+# Move around windows with vim keys
+bindsym $mod+Shift+$left move left
+bindsym $mod+Shift+$down move down
+bindsym $mod+Shift+$up move up
+bindsym $mod+Shift+$right move right
+
 # split in horizontal orientation
-bindsym $mod+h split h
+bindsym $mod+s split h
 
 # split in vertical orientation
 bindsym $mod+v split v
@@ -43,4 +55,4 @@ bindsym $mod+Shift+minus move scratchpad
 # Show the first scratchpad window
 bindsym $mod+minus scratchpad show
 
-bindsym $mod+s layout toggle tabbed split
+bindsym $mod+t layout toggle tabbed split
diff --git a/symlinks/config/sway/conf.d/10_workspaces b/symlinks/config/sway/conf.d/10_workspaces
index 798d969..e0461e2 100644
--- a/symlinks/config/sway/conf.d/10_workspaces
+++ b/symlinks/config/sway/conf.d/10_workspaces
@@ -37,3 +37,15 @@ bindsym $mod+Shift+0 move container to workspace $music_workspace
 # Alt+Tab like switching of workspaces
 bindsym $mod+Tab workspace next
 bindsym $mod+Shift+Tab workspace prev
+
+# Arrow workspace switch
+bindsym $mod+Control+Right workspace next
+bindsym $mod+Control+Down workspace next
+bindsym $mod+Control+Left workspace prev
+bindsym $mod+Control+Up workspace prev
+
+# Vim keys workspace switch
+bindsym $mod+Control+$right workspace next
+bindsym $mod+Control+$down workspace next
+bindsym $mod+Control+$left workspace prev
+bindsym $mod+Control+$up workspace prev
diff --git a/symlinks/config/sway/conf.d/15_workspace_assignment b/symlinks/config/sway/conf.d/15_workspace_assignment
index 4356e0b..ff7fcba 100644
--- a/symlinks/config/sway/conf.d/15_workspace_assignment
+++ b/symlinks/config/sway/conf.d/15_workspace_assignment
@@ -1,6 +1,6 @@
 # Assign windows to workspaces
 assign [class="firefox"] $browser_workspace
-assign [class="Spotify"] $music_workspace
+assign [instance="spotify"] $music_workspace
 assign [class="Hexchat"] $chat_workspace
 assign [class="Slack"] $chat_workspace
 assign [class="Gvim"] $editor_workspace
diff --git a/symlinks/config/sway/conf.d/20_lockconfig b/symlinks/config/sway/conf.d/20_lockconfig
index 776504a..73bc1d6 100644
--- a/symlinks/config/sway/conf.d/20_lockconfig
+++ b/symlinks/config/sway/conf.d/20_lockconfig
@@ -1,6 +1,6 @@
 # Define locker script
 set $locker ~/bin/lockscreen
-bindsym $mod+L exec $locker
+bindsym $alt+L exec $locker
 
 # IDLE CONFIG
 exec swayidle -w \
diff --git a/symlinks/config/sway/conf.d/41_pointer b/symlinks/config/sway/conf.d/41_pointer
index 2700f5b..3aba81b 100644
--- a/symlinks/config/sway/conf.d/41_pointer
+++ b/symlinks/config/sway/conf.d/41_pointer
@@ -1,3 +1,5 @@
 input type:pointer {
 	accel_profile flat
 }
+
+focus_follows_mouse no
diff --git a/symlinks/config/sway/conf.d/70_resizing b/symlinks/config/sway/conf.d/70_resizing
index 2acff64..ad88a26 100644
--- a/symlinks/config/sway/conf.d/70_resizing
+++ b/symlinks/config/sway/conf.d/70_resizing
@@ -6,6 +6,12 @@ mode "resize" {
     bindsym Up resize shrink height 10 px or 10 ppt
     bindsym Right resize grow width 10 px or 10 ppt
 
+    # resize with vim keys
+    bindsym $left resize shrink width 10 px or 10 ppt
+    bindsym $down resize grow height 10 px or 10 ppt
+    bindsym $up resize shrink height 10 px or 10 ppt
+    bindsym $right resize grow width 10 px or 10 ppt
+
     # press p to enter precise resize mode
     bindsym p mode "resize_precise"
 
@@ -21,6 +27,12 @@ mode "resize_precise" {
     bindsym Up resize shrink height 1 px or 1 ppt
     bindsym Right resize grow width 1 px or 1 ppt
 
+    # resize with vim keys
+    bindsym $left resize shrink width 1 px or 1 ppt
+    bindsym $down resize grow height 1 px or 1 ppt
+    bindsym $up resize shrink height 1 px or 1 ppt
+    bindsym $right resize grow width 1 px or 1 ppt
+
     # go back to normal resize mode with p
     bindsym p mode "resize"