diff --git a/.config/kitty/theme-base16-gruvbox-dark.conf b/.config/kitty/base16-gruvbox-dark-medium-256.conf
similarity index 83%
rename from .config/kitty/theme-base16-gruvbox-dark.conf
rename to .config/kitty/base16-gruvbox-dark-medium-256.conf
index 3399014..09a7d9d 100644
--- a/.config/kitty/theme-base16-gruvbox-dark.conf
+++ b/.config/kitty/base16-gruvbox-dark-medium-256.conf
@@ -1,21 +1,21 @@
-# Base16 Gruvbox dark, hard - kitty color config
+# Base16 Gruvbox dark, medium - kitty color config
 # Scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
-background #1d2021
+background #282828
 foreground #d5c4a1
 selection_background #d5c4a1
-selection_foreground #1d2021
+selection_foreground #282828
 url_color #bdae93
 cursor #d5c4a1
 active_border_color #665c54
 inactive_border_color #3c3836
-active_tab_background #1d2021
+active_tab_background #282828
 active_tab_foreground #d5c4a1
 inactive_tab_background #3c3836
 inactive_tab_foreground #bdae93
 tab_bar_background #3c3836
 
 # normal
-color0 #1d2021
+color0 #282828
 color1 #fb4934
 color2 #b8bb26
 color3 #fabd2f
diff --git a/.config/kitty/base16-solarized-light-256.conf b/.config/kitty/base16-solarized-light-256.conf
new file mode 100644
index 0000000..2a22dd1
--- /dev/null
+++ b/.config/kitty/base16-solarized-light-256.conf
@@ -0,0 +1,43 @@
+# Base16 Solarized Light - kitty color config
+# Scheme by Ethan Schoonover (modified by aramisgithub)
+background #fdf6e3
+foreground #586e75
+selection_background #586e75
+selection_foreground #fdf6e3
+url_color #657b83
+cursor #586e75
+active_border_color #839496
+inactive_border_color #eee8d5
+active_tab_background #fdf6e3
+active_tab_foreground #586e75
+inactive_tab_background #eee8d5
+inactive_tab_foreground #657b83
+tab_bar_background #eee8d5
+
+# normal
+color0 #fdf6e3
+color1 #dc322f
+color2 #859900
+color3 #b58900
+color4 #268bd2
+color5 #6c71c4
+color6 #2aa198
+color7 #586e75
+
+# bright
+color8 #839496
+color9 #dc322f
+color10 #859900
+color11 #b58900
+color12 #268bd2
+color13 #6c71c4
+color14 #2aa198
+color15 #002b36
+
+# extended base16 colors
+color16 #cb4b16
+color17 #d33682
+color18 #eee8d5
+color19 #93a1a1
+color20 #657b83
+color21 #073642
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 43f7d99..fdbf184 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,139 +1,9 @@
-font_family      Fira Code Medium
+font_family      Fira Code Regular
 bold_font        Fira Code Bold
 italic_font      Fira Code Italic
 bold_italic_font auto
-font_size 11.0
-window_padding_width 2.0
-window_padding_height 2.0
-
-# Base16 Gruvbox dark, hard - kitty color config
-# Scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
-background #1d2021
-foreground #d5c4a1
-selection_background #d5c4a1
-selection_foreground #1d2021
-url_color #bdae93
-cursor #d5c4a1
-active_border_color #665c54
-inactive_border_color #3c3836
-active_tab_background #1d2021
-active_tab_foreground #d5c4a1
-inactive_tab_background #3c3836
-inactive_tab_foreground #bdae93
-tab_bar_background #3c3836
-
-# normal
-color0 #1d2021
-color1 #fb4934
-color2 #b8bb26
-color3 #fabd2f
-color4 #83a598
-color5 #d3869b
-color6 #8ec07c
-color7 #d5c4a1
-
-# bright
-color8 #665c54
-color9 #fb4934
-color10 #b8bb26
-color11 #fabd2f
-color12 #83a598
-color13 #d3869b
-color14 #8ec07c
-color15 #fbf1c7
-
-# extended base16 colors
-color16 #fe8019
-color17 #d65d0e
-color18 #3c3836
-color19 #504945
-color20 #bdae93
-color21 #ebdbb2
-
-## Base16 Solarized Dark - kitty color config
-## Scheme by Ethan Schoonover (modified by aramisgithub)
-#background #002b36
-#foreground #93a1a1
-#selection_background #93a1a1
-#selection_foreground #002b36
-#url_color #839496
-#cursor #93a1a1
-#active_border_color #657b83
-#inactive_border_color #073642
-#active_tab_background #002b36
-#active_tab_foreground #93a1a1
-#inactive_tab_background #073642
-#inactive_tab_foreground #839496
-#tab_bar_background #073642
-#
-## normal
-#color0 #002b36
-#color1 #dc322f
-#color2 #859900
-#color3 #b58900
-#color4 #268bd2
-#color5 #6c71c4
-#color6 #2aa198
-#color7 #93a1a1
-#
-## bright
-#color8 #657b83
-#color9 #dc322f
-#color10 #859900
-#color11 #b58900
-#color12 #268bd2
-#color13 #6c71c4
-#color14 #2aa198
-#color15 #fdf6e3
-#
-## extended base16 colors
-#color16 #cb4b16
-#color17 #d33682
-#color18 #073642
-#color19 #586e75
-#color20 #839496
-#color21 #eee8d5
-
-# Base16 Default Dark - kitty color config
-## Scheme by Chris Kempson (http://chriskempson.com)
-#background #181818
-#foreground #d8d8d8
-#selection_background #d8d8d8
-#selection_foreground #181818
-#url_color #b8b8b8
-#cursor #d8d8d8
-#active_border_color #585858
-#inactive_border_color #282828
-#active_tab_background #181818
-#active_tab_foreground #d8d8d8
-#inactive_tab_background #282828
-#inactive_tab_foreground #b8b8b8
-#tab_bar_background #282828
-#
-## normal
-#color0 #181818
-#color1 #ab4642
-#color2 #a1b56c
-#color3 #f7ca88
-#color4 #7cafc2
-#color5 #ba8baf
-#color6 #86c1b9
-#color7 #d8d8d8
-#
-## bright
-#color8 #585858
-#color9 #ab4642
-#color10 #a1b56c
-#color11 #f7ca88
-#color12 #7cafc2
-#color13 #ba8baf
-#color14 #86c1b9
-#color15 #f8f8f8
-#
-## extended base16 colors
-#color16 #dc9656
-#color17 #a16946
-#color18 #282828
-#color19 #383838
-#color20 #b8b8b8
-#color21 #e8e8e8
+font_size 12.0
+#window_padding_width 2.0
+#window_padding_height 2.0
+#include base16-solarized-light-256.conf
+include base16-gruvbox-dark-medium-256.conf
diff --git a/.config/kitty/theme-base16-solarized-dark.conf b/.config/kitty/theme-base16-solarized-dark.conf
deleted file mode 100644
index cdcc683..0000000
--- a/.config/kitty/theme-base16-solarized-dark.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-# Base16 Solarized Dark - kitty color config
-# Scheme by Ethan Schoonover (modified by aramisgithub)
-background #002b36
-foreground #93a1a1
-selection_background #93a1a1
-selection_foreground #002b36
-url_color #839496
-cursor #93a1a1
-active_border_color #657b83
-inactive_border_color #073642
-active_tab_background #002b36
-active_tab_foreground #93a1a1
-inactive_tab_background #073642
-inactive_tab_foreground #839496
-tab_bar_background #073642
-
-# normal
-color0 #002b36
-color1 #dc322f
-color2 #859900
-color3 #b58900
-color4 #268bd2
-color5 #6c71c4
-color6 #2aa198
-color7 #93a1a1
-
-# bright
-color8 #657b83
-color9 #dc322f
-color10 #859900
-color11 #b58900
-color12 #268bd2
-color13 #6c71c4
-color14 #2aa198
-color15 #fdf6e3
-
-# extended base16 colors
-color16 #cb4b16
-color17 #d33682
-color18 #073642
-color19 #586e75
-color20 #839496
-color21 #eee8d5
diff --git a/.config/lf/lfrc b/.config/lf/lfrc
index 2e1d422..8004468 100644
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@@ -5,7 +5,35 @@ map i $~/.config/lf/pv.sh $f | less -R
 cmd trash %trash-put "$fx"
 
 # Search with fzf
-map f $vi $(fzf)
+# map f $vi $(fzf)
+
+# If you want to jump to a file or directory in lf using fuzzy matching, you can utilize fzf for this purpose:
+cmd fzf_jump ${{
+    res="$(fd . | fzf --reverse --header='Jump to location' | sed 's/\\/\\\\/g;s/"/\\"/g')"
+    if [ -d "$res" ] ; then
+        cmd="cd"
+    elif [ -f "$res" ] ; then
+        cmd="select"
+    else
+        exit 0
+    fi
+    lf -remote "send $id $cmd \"$res\""
+}}
+map f :fzf_jump
+
+# Combining fzf with ripgrep, you can interactively search in the contents of files under the current directory and select a file from the results:
+cmd fzf_search ${{
+    res="$( \
+        RG_PREFIX="rg --column --line-number --no-heading --color=always \
+            --smart-case "
+        FZF_DEFAULT_COMMAND="$RG_PREFIX ''" \
+            fzf --bind "change:reload:$RG_PREFIX {q} || true" \
+            --ansi --layout=reverse --header 'Search in files' \
+            | cut -d':' -f1
+    )"
+    [ ! -z "$res" ] && lf -remote "send $id select \"$res\""
+}}
+map gs :fzf_search
 
 # Recreate open-with with lf
 cmd open-with %"$@" "$fx"
diff --git a/.config/nvim/ginit.vim b/.config/nvim/ginit.vim
new file mode 100644
index 0000000..acf30dc
--- /dev/null
+++ b/.config/nvim/ginit.vim
@@ -0,0 +1,4 @@
+"set runtimepath^=~/.vim runtimepath+=~/.vim/after
+"let &packpath=&runtimepath
+"source ~/.vimrc
+GuiFont! Fira\ Code:h11:m
diff --git a/.config/sway/background2022.jpg b/.config/sway/background2022.jpg
new file mode 100644
index 0000000..287ed7a
Binary files /dev/null and b/.config/sway/background2022.jpg differ
diff --git a/.config/sway/base16-gruvbox-dark-medium.config b/.config/sway/base16-gruvbox-dark-medium.config
new file mode 100644
index 0000000..088074c
--- /dev/null
+++ b/.config/sway/base16-gruvbox-dark-medium.config
@@ -0,0 +1,19 @@
+## Base16 Gruvbox dark, medium
+# Author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+
+set $base00 #282828
+set $base01 #3c3836
+set $base02 #504945
+set $base03 #665c54
+set $base04 #bdae93
+set $base05 #d5c4a1
+set $base06 #ebdbb2
+set $base07 #fbf1c7
+set $base08 #fb4934
+set $base09 #fe8019
+set $base0A #fabd2f
+set $base0B #b8bb26
+set $base0C #8ec07c
+set $base0D #83a598
+set $base0E #d3869b
+set $base0F #d65d0e
diff --git a/.config/sway/base16-solarized-light.config b/.config/sway/base16-solarized-light.config
new file mode 100644
index 0000000..a4a91f5
--- /dev/null
+++ b/.config/sway/base16-solarized-light.config
@@ -0,0 +1,19 @@
+## Base16 Solarized Light
+# Author: Ethan Schoonover (modified by aramisgithub)
+
+set $base00 #fdf6e3
+set $base01 #eee8d5
+set $base02 #93a1a1
+set $base03 #839496
+set $base04 #657b83
+set $base05 #586e75
+set $base06 #073642
+set $base07 #002b36
+set $base08 #dc322f
+set $base09 #cb4b16
+set $base0A #b58900
+set $base0B #859900
+set $base0C #2aa198
+set $base0D #268bd2
+set $base0E #6c71c4
+set $base0F #d33682
diff --git a/.config/sway/config b/.config/sway/config
index 0cbf967..659e71e 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -35,10 +35,10 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 #
 # Example configuration:
 #
-exec swayidle -w \
-         timeout 300 'swaylock -f -c 000000' \
-         timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-         before-sleep 'swaylock -f -c 000000'
+#exec swayidle -w \
+#         timeout 300 'swaylock -f -c 000000' \
+#         timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+#         before-sleep 'swaylock -f -c 000000'
 #
 # This will lock your screen after 300 seconds of inactivity, then turn off
 # your displays after another 300 seconds, and turn your screens back on when
@@ -244,17 +244,20 @@ bindsym $mod+Shift+0 move container to workspace $ws10
 
 # Assignments
 assign [app_id="^firefox$"] → $ws3
+assign [app_id="^librewolf$"] → $ws3
 assign [app_id="^cantata$"] → $ws10
 assign [app_id="^org.keepassxc.KeePassXC$" title="^Avaa tietokanta"] → $ws3
 assign [app_id="^org.keepassxc.KeePassXC$" title="(?!Avaa tietokanta)"] → $ws9
 assign [app_id="^pavucontrol$"] → $ws10
+assign [app_id="^blueman-manager$"] → $ws10
 assign [app_id="^lutris$"] → $ws6
+assign [app_id="com.nextcloud.desktopclient.nextcloud"] → $ws10
+assign [app_id="^Element$"] → $ws2
 assign [class="^krita$"] → $ws4
 assign [class="^Blender$"] → $ws4
 assign [class="^Gimp$"] → $ws4
 assign [class="^Nextcloud$"] → $ws10
 assign [class="^Element$"] → $ws2
-assign [app_id="^Element$"] → $ws2
 
 # Modifiers
 for_window [app_id="telegramdesktop" title="(.*)Telegram(.*)"] floating enable, move scratchpad
@@ -263,6 +266,7 @@ for_window [app_id="mpv"] floating enable, move position center
 for_window [app_id="net.sourceforge.mumble.mumble"] floating enable, move position center
 for_window [app_id="imv"] floating enable
 for_window [app_id="com.nextcloud.desktopclient.nextcloud"] floating enable, move position mouse, move down 25px
+for_window [app_id="opensnitch_ui"] floating enable, move position center
 for_window [class="itch"] floating enable
 # for_window [class="Wine"] floating enable
 for_window [class="vlc"] floating enable
@@ -274,6 +278,9 @@ for_window [class="boincmgr"] floating disable
 
 # Games
 for_window [class="kfgame.exe"] floating enable
+for_window [class="noita.exe"] floating enable
+for_window [class="^galaxyclient.exe$"] floating enable
+for_window [class="epicgameslauncher.exe"] floating enable
 for_window [class="Origin"] floating enable
 for_window [class="^steam_app"] floating enable
 for_window [class="Wine"] floating enable
@@ -305,85 +312,17 @@ bindsym $mod+t [app_id="telegramdesktop"] scratchpad show
 bindsym $mod+n [class="^Nextcloud"] scratchpad show
 
 # gaps
-smart_borders off
-smart_gaps off
-gaps outer 0
-gaps inner 0
-
-## Base16 Gruvbox dark, hard
-# Author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
-#
-# You can use these variables anywhere in the i3 configuration file.
-
-#set $base00 #1d2021
-#set $base01 #3c3836
-#set $base02 #504945
-#set $base03 #665c54
-#set $base04 #bdae93
-#set $base05 #d5c4a1
-#set $base06 #ebdbb2
-#set $base07 #fbf1c7
-#set $base08 #fb4934
-#set $base09 #fe8019
-#set $base0A #fabd2f
-#set $base0B #b8bb26
-#set $base0C #8ec07c
-#set $base0D #83a598
-#set $base0E #d3869b
-#set $base0F #d65d0e
-
-
-# https://github.com/khamer/base16-i3/tree/master/colors
-
-## Base16 Solarized Light
-# Author: Ethan Schoonover (modified by aramisgithub)
-#
-# You can use these variables anywhere in the i3 configuration file.
-
-#set $base00 #fdf6e3
-#set $base01 #eee8d5
-#set $base02 #93a1a1
-#set $base03 #839496
-#set $base04 #657b83
-#set $base05 #586e75
-#set $base06 #073642
-#set $base07 #002b36
-#set $base08 #dc322f
-#set $base09 #cb4b16
-#set $base0A #b58900
-#set $base0B #859900
-#set $base0C #2aa198
-#set $base0D #268bd2
-#set $base0E #6c71c4
-#set $base0F #d33682
-
-## Base16 Solarized Dark
-# Author: Ethan Schoonover (modified by aramisgithub)
-#
-# You can use these variables anywhere in the i3 configuration file.
-
-set $base00 #002b36
-set $base01 #073642
-set $base02 #586e75
-set $base03 #657b83
-set $base04 #839496
-set $base05 #93a1a1
-set $base06 #eee8d5
-set $base07 #fdf6e3
-set $base08 #dc322f
-set $base09 #cb4b16
-set $base0A #b58900
-set $base0B #859900
-set $base0C #2aa198
-set $base0D #268bd2
-set $base0E #6c71c4
-set $base0F #d33682
+#smart_borders off
+#smart_gaps on
+#gaps outer 0
+#gaps inner 10
 
 # Basic bar configuration using the Base16 variables.
 bar {
     swaybar_command waybar
 }
 
+include /home/lanxu/.config/sway/base16-gruvbox-dark-medium.config
 # Basic color configuration using the Base16 variables for windows and borders.
 # Property Name         Border  BG      Text    Indicator Child Border
 client.focused          $base05 $base0D $base00 $base0D $base0C
@@ -401,7 +340,7 @@ exec --no-startup-id "dunst" # in case multiple daemons are installed
 
 # Services
 exec --no-startup-id "mpd /home/lanxu/.config/mpd/mpd.conf" # Music Player Daemon
-
+exec --no-startup-id "systemd-run --user --unit=fullscreen-inhibitor --on-calendar='*:*:0/15' /home/lanxu/Scripts/sway/fullscreen-inhibitor.sh" # Fullscreen inhibitor for dunst
 #exec --no-startup-id "./Scripts/sway_screensaver.sh" # Screensaver
 exec --no-startup-id "udiskie --notify --automount" # Automounter
 
@@ -410,15 +349,21 @@ exec --no-startup-id "cantata"
 exec --no-startup-id "pavucontrol"
 exec --no-startup-id "keepassxc" # Password manager
 exec --no-startup-id "nextcloud --background"
+exec --no-startup-id "gammastep -l 61.49911:23.78712" # blue light filter, flickers
 
 # Applications
 exec --no-startup-id "dex -a -s ~/.config/autostart/"
-exec --no-startup-id "telegram-desktop"
-exec --no-startup-id "element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland"
-exec --no-startup-id "steam"
+# exec --no-startup-id "telegram-desktop" # Added to autostart
+# exec --no-startup-id "element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland" # Added to autostart
+# exec --no-startup-id "steam" # Should be done with autostart
 
 # Set manual layout for tray workspace
 #exec --no-startup-id "i3-msg 'workspace 10:tray; append_layout /home/lanxu/.config/i3/tray.json'"
+set $locker 'swaylock -f -c 000000'
+exec swayidle -w \
+    timeout 60 $locker \
+    timeout 65 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+    before-sleep $locker
 
 bindsym XF86AudioStop exec --no-startup-id mpc stop
 bindsym XF86AudioPlay exec --no-startup-id mpc toggle
@@ -431,11 +376,14 @@ bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ to
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
 # Print screen
+bindsym $mod+F8 exec --no-startup-id "./Scripts/sway/take_screencast.sh region-copy"
+bindsym $mod+Shift+F8 exec --no-startup-id "./Scripts/sway/take_screencast.sh region"
 bindsym $mod+Print exec --no-startup-id "./Scripts/sway/take_screenshot.sh region-copy"
 bindsym $mod+Shift+Print exec --no-startup-id "./Scripts/sway/take_screenshot.sh region"
 bindsym Print exec --no-startup-id "./Scripts/sway/take_screenshot.sh screen"
 #bindsym Print exec --no-startup-id flameshot gui
 #bindsym Scroll_Lock exec --no-startup-id "./Scripts/powermenu.sh"
+# With Keychron Scroll_Lock is assigned automatically to mod+c (microphone on windows)
 bindsym $mod+c exec --no-startup-id "./Scripts/powermenu.sh"
 
 # Moving desktops
@@ -443,18 +391,32 @@ bindsym $mod+o move workspace to output left
 bindsym $mod+Ctrl+Right move workspace to output right
 bindsym $mod+Ctrl+Left move workspace to output left
 
+## One screen
+##output HDMI-A-1 disable
+#output HDMI-A-2 disable
+##output DP-2 pos 0 0 res 1920x1080@60Hz adaptive_sync on
+#output DP-2 pos 0 0 res 1920x1080@120Hz adaptive_sync on
+
+# Two screens
+output HDMI-A-1 pos 0 0 res 1920x1080
+output HDMI-A-2 disable
+#output HDMI-A-1 disable
+#output HDMI-A-2 pos 0 0 res 1920x1080
+output DP-2 pos 1920 0 res 1920x1080@144Hz adaptive_sync on
+#output DP-2 pos 0 0 res 1920x1080@144Hz adaptive_sync on
+
+# Other
+#output DVI-D-1 pos 0 0 res 1920x1080
 #output DP-2 pos 1920 0 res 1920x1080@60Hz adaptive_sync off
 #output DP-2 disable
 #output DVI-D-1 disable
-output DVI-D-1 pos 0 0 res 1920x1080
-output DP-2 pos 1920 0 res 1920x1080@144Hz adaptive_sync on
 #output HDMI-A-1 disable
 #output HDMI-A-1 pos 3840 0 res 1680x1050
 #output HDMI-A-2 pos 5520 0 res 1920x1080 # TV
 #output HDMI-A-2 pos 3840 0 res 1920x1080 # TV
 
-output "*" bg "/home/lanxu/.config/sway/background.jpg" fill
-
+output "*" bg "/home/lanxu/.config/sway/background2022.jpg" fill
+#max_render_time 5
 # inhibits
 # wayland
 for_window [app_id=".*"] inhibit_idle fullscreen
diff --git a/.config/waybar/base16-gruvbox-dark-medium.css b/.config/waybar/base16-gruvbox-dark-medium.css
new file mode 100644
index 0000000..5f90b4a
--- /dev/null
+++ b/.config/waybar/base16-gruvbox-dark-medium.css
@@ -0,0 +1,23 @@
+/*
+*
+* Base16 Gruvbox dark, medium
+* Author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+*
+*/
+
+@define-color base00 #282828;
+@define-color base01 #3c3836;
+@define-color base02 #504945;
+@define-color base03 #665c54;
+@define-color base04 #bdae93;
+@define-color base05 #d5c4a1;
+@define-color base06 #ebdbb2;
+@define-color base07 #fbf1c7;
+@define-color base08 #fb4934;
+@define-color base09 #fe8019;
+@define-color base0A #fabd2f;
+@define-color base0B #b8bb26;
+@define-color base0C #8ec07c;
+@define-color base0D #83a598;
+@define-color base0E #d3869b;
+@define-color base0F #d65d0e;
diff --git a/.config/waybar/base16-solarized-light.css b/.config/waybar/base16-solarized-light.css
new file mode 100644
index 0000000..4b8f1f5
--- /dev/null
+++ b/.config/waybar/base16-solarized-light.css
@@ -0,0 +1,23 @@
+/*
+*
+* Base16 Solarized Light
+* Author: Ethan Schoonover (modified by aramisgithub)
+*
+*/
+
+@define-color base00 #fdf6e3;
+@define-color base01 #eee8d5;
+@define-color base02 #93a1a1;
+@define-color base03 #839496;
+@define-color base04 #657b83;
+@define-color base05 #586e75;
+@define-color base06 #073642;
+@define-color base07 #002b36;
+@define-color base08 #dc322f;
+@define-color base09 #cb4b16;
+@define-color base0A #b58900;
+@define-color base0B #859900;
+@define-color base0C #2aa198;
+@define-color base0D #268bd2;
+@define-color base0E #6c71c4;
+@define-color base0F #d33682;
diff --git a/.config/waybar/config b/.config/waybar/config
index 4d2d560..f79e3df 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -18,8 +18,6 @@
 			"cpu",
 			"custom/gpu",
 			"network",
-			"disk",
-			"custom/pacman",
 			"mpd",
 			"tray"
 		],
@@ -103,14 +101,16 @@
 		},
 		"disk": {
 			"interval": 5,
-			"format": "Disk {percentage_used:2}%",
+			"format": "💾 {percentage_used:2}%",
 			"path": "/"
 		},
 		"tray": {
-			"icon-size": 20
+			"icon-size": 20,
+			"spacing": 5
 		},
 		"mpd": {
-			"format": "{title}"
+			"format": "🎵 {title}",
+			"max-length": 20
 		},
 		"custom/gpu": {
 			"format": "GPU {} ℃",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 77aea4a..5797b97 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,3 +1,6 @@
+/*@import "/home/lanxu/.config/waybar/base16-solarized-light.css";*/
+@import "/home/lanxu/.config/waybar/base16-gruvbox-dark-medium.css";
+
 * {
 	font-size: 12px;
 	font-family: "Fira Sans", monospace;
@@ -5,7 +8,6 @@
 
 window#waybar {
 	background: transparent;
-	color: #fdf6e3;
 }
 
 #workspaces,
@@ -21,87 +23,89 @@ window#waybar {
 #custom-pacman,
 #mpd,
 #network,
-#tray {
-	background: #1a1a1a;
-	margin-top: 2px;
+#tray,
+#mpd {
+	background: @base00;
+	color: @base07;
+	margin-top: 0px;
 	margin-bottom: 2px;
 }
 
+#tray {
+	background: @base03;
+	color: @base0D;
+	padding-left: 10px;
+	padding-right: 5px;
+	border-radius: 0px 0 0 5px;
+}
+
 #workspaces {
-	border-radius: 0 5px 5px 0;
+	border-radius: 0 0px 5px 0;
 }
 
 #clock.1 {
-	border-radius: 5px 0 0 5px;
+	border-radius: 0px 0 0 5px;
 }
 #clock.2 {
 	font-weight: bold;
 }
 #clock.3 {
-	border-radius: 0 5px 5px 0;
+	border-radius: 0 0px 5px 0;
 }
 #pulseaudio {
-	border-radius: 5px 0 0 5px;
+	border-radius: 0px 0 0 5px;
 }
 
 #workspaces button {
-	color: #fdf6e3;
+	color: @base07;
 	border: none;
 	border-radius: 0;
-	padding: 0 5px;
+	padding: 0 5px 0 5px;
+	border-top: 2px solid @base00;
+	border-bottom: 2px solid @base00;
+}
+#workspaces button:last-child {
 	margin-right: 5px;
-	border-bottom: 2px solid #1a1a1a;
 }
 #workspaces button.focused {
-	color: #268bd2;
-	border-bottom: 2px solid #268bd2;
+	background: @base02;
 }
 #workspaces button.urgent {
-	color: #af005f;
-	border-bottom: 2px solid #af005f;
+	background: @base08;
 }
 #workspaces button.urgent:hover {
 	box-shadow: inherit;
 	text-shadow: inherit;
-	background: #1a1a1a;
+	background: @base08;
 	border-radius: 0;
-	border-bottom: 2px solid #af005f;
 }
 #workspaces button:hover {
 	box-shadow: inherit;
 	text-shadow: inherit;
-	background: #1a1a1a;
+	background: @base02;
 	border-radius: 0;
-	border-bottom: 2px solid #268bd2;
 }
-/*
-#workspaces button:hover {
-	color: #268bd2;
-	border: 0;
-	border-bottom: 2px solid #268bd2;
-	background: #1a1a1a;
-}*/
 
 #pulseaudio {
-	color: #268bd2;
+	color: @base0D;
 }
 #memory {
-	color: #2aa198;
+	color: @base0D;
 }
 #cpu {
-	color: #6c71c4;
+	color: @base0D;
 }
 #custom-gpu {
-	color: #6c71c4;
+	color: @base0D;
 }
 #battery {
-	color: #859900;
+	color: @base0D;
 }
 #disk {
-	color: #b58900;
+	color: @base0D;
 }
 #mpd {
-	color: #EEE;
+	color: @base0D;
 }
 
 #clock,
diff --git a/.vimrc b/.vimrc
index 7127c78..5f2b8cb 100644
--- a/.vimrc
+++ b/.vimrc
@@ -16,7 +16,7 @@ Plug 'rust-lang/rust.vim', {'for': 'rust'}
 
 " Syntax checking
 "Plug 'Valloric/YouCompleteMe' " alternative #1, full-blown
-Plug 'w0rp/ale',
+Plug 'dense-analysis/ale'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 
 " Useful plugins
@@ -29,6 +29,10 @@ Plug 'ervandew/supertab'
 Plug 'reedes/vim-lexical'
 Plug 'majutsushi/tagbar'
 
+" Search
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
+
 " Snippets
 Plug 'sirver/ultisnips'
 Plug 'honza/vim-snippets'
@@ -58,10 +62,11 @@ filetype plugin indent on
 syntax on
 "set t_Co=256
 set termguicolors
-set background=dark
+set background=light
 "let base16colorspace=256
-"colorscheme base16-solarized-dark
-colorscheme base16-gruvbox-dark-hard
+"colorscheme base16-solarized-light
+"colorscheme base16-gruvbox-dark-hard
+colorscheme base16-gruvbox-dark-medium
 "colorscheme base16-default-dark
 
 
@@ -164,7 +169,7 @@ let g:ale_linters = {
 			\'javascript': ['standard'],
 			\'vue': ['standard --plugin html "**/*.{js,vue}"'],
 			\'jsx': ['standard --plugin html "**/*.{js,jsx}"'],
-			\'rust': ['cargo']
+			\'rust': ['analyzer']
 			\}
 let b:ale_fixers = {
 			\'*': ['remove_trailing_lines', 'trim_whitespace'],
diff --git a/.zprofile b/.zprofile
index da22092..55e7196 100644
--- a/.zprofile
+++ b/.zprofile
@@ -13,12 +13,6 @@ export COCOS_CONSOLE_ROOT=${HOME}/Sovellukset/cocos2d-js-v3.6.1/tools/cocos2d-co
 export IONIC_INSTALL=${HOME}/Asiakirjat/Work/Android/ionic/node_modules/.bin
 export PATH=$IONIC_INSTALL:$COCOS_CONSOLE_ROOT:$PATH
 
-# npm without sudo
-# https://github.com/sindresorhus/guides/blob/master/npm-global-without-sudo.md
-export NPM_PACKAGES=${HOME}/.npm-packages
-export NODE_PATH=$NPM_PACKAGES/lib/node_modules:$NODE_PATH
-export PATH=$NPM_PACKAGES/bin:$PATH
-
 # Local
 export PATH=/usr/local/bin:$PATH
 export PATH=${HOME}/.local/bin:$PATH
@@ -31,7 +25,7 @@ export PATH=$LANXU_SCRIPTS_ROOT:$PATH
 #export XDG_CURRENT_DESKTOP=gnome
 # export QT_STYLE_OVERRIDE='adwaita'
 # qt5-styleplugins must be installed to set this to gtk2
-#export QT_QPA_PLATFORMTHEME="qt5ct"
+export QT_QPA_PLATFORMTHEME="qt5ct"
 #export QT_AUTO_SCREEN_SCALE_FACTOR=0
 #export QT_SCALE_FACTOR=1
 
@@ -43,8 +37,10 @@ export WINEDLLOVERRIDES="winemenubuilder.exe=d;winegstreamer=" # No more desktop
 # Npm with no sudo
 # https://github.com/sindresorhus/guides/blob/master/npm-global-without-sudo.md
 export NPM_PACKAGES="${HOME}/.npm-packages"
-export NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
-export PATH="$NPM_PACKAGES/bin:$PATH"
+# export NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH" # Do not enable by default
+export PATH="$PATH:$NPM_PACKAGES/bin"
+export MANPATH="${MANPATH-$(manpath)}:$NPM_PACKAGES/share/man"
+# dotnet
 export PATH="${HOME}/.dotnet:$PATH"
 
 # Emscripten
@@ -73,3 +69,10 @@ export TERMCMD=$TERMINAL
 #  exec startx
 #fi
 export WORKON_HOME="${HOME}/Envs"
+
+# Rootless docker (https://docs.docker.com/engine/security/rootless/)
+export PATH=/home/lanxu/bin:$PATH
+export DOCKER_HOST=unix:///run/user/1000/docker.sock
+
+# nixOS integration
+#export XDG_DATA_DIRS="$HOME/.nix-profile/share:$XDG_DATA_DIRS"
diff --git a/.zshrc b/.zshrc
index d80fee2..759542e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -52,6 +52,8 @@ alias ll="exa -lh"
 alias la="exa -a"
 alias lp="keepass.sh"
 alias ranger="ranger"
+alias vim="nvim"
+alias vimdiff="nvim -d"
 #alias lf="TCELL_TRUECOLOR=on lf"
 alias search="search.sh"
 #alias ls="ls -N --time-style=long-iso --color=auto"
@@ -67,6 +69,8 @@ alias rbackup="restic -r rclone:hubic:ChimeraLinux"
 alias bat="bat --theme base16"
 alias wine32="WINEPREFIX=~/.wine32 wine"
 alias resetkbcolors="/usr/bin/g512-led -p /etc/g810-led/profile"
+alias showerrors="journalctl -p 3 -xb"
+alias browsephone="mount-phone | xargs -I % lf %"
 # alias steam="DBUS_SESSION_BUS_ADDRESS=unix:abstract=/dev/null steam"
 # https://github.com/chriskempson/base16-shell
 # git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell
@@ -84,8 +88,7 @@ alias resetkbcolors="/usr/bin/g512-led -p /etc/g810-led/profile"
 
 function auradd {
 	pkg=$1
-	aur sync --no-view --no-confirm --rebuild --database localrepo "$pkg" >&2
-	sudo pacman -Sy "$pkg"
+	aur sync --no-view --no-confirm --rebuild --database localrepo "$pkg" >&2 && sudo pacman -Sy "$pkg"
 }
 
 function aurrm {
@@ -106,6 +109,10 @@ function aurupdate {
 	sudo pacman -Syu
 }
 
+function aurclear {
+	find ~/.cache/aurutils/sync -type d -name .git -execdir git clean -xf \;
+}
+
 function c {
 	echo "scale=2; $@" | bc
 }