diff --git a/README.md b/README.md
index 9c2fbac..7d2b7a0 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 + Launcher: rofi
 + Bar: polybar
 + Notifications: dunst
-+ Compositor: [picom](https://github.com/sdhand/picom)
++ Compositor: [picom](https://github.com/tryone144/compton/tree/feature/dual_kawase)
 + Set Wallpaper: feh
 + Info: [fet.sh](https://github.com/6gk/fet.sh)
 + Screenshots: Flameshot
@@ -16,5 +16,6 @@
 ## Fonts
 + Fira Code Regular Nerd Font Complete Mono.ttf: General
 + IPAGothic.ttf: Japanese Characters
++ [Siji](https://github.com/stark/siji): Icon Font for Polybar
 
 ![Home](screenshots/home.png)
diff --git a/laptop-nord/.config/alacritty/alacritty.yml b/laptop-nord/.config/alacritty/alacritty.yml
index 4d07dfb..80f846c 100644
--- a/laptop-nord/.config/alacritty/alacritty.yml
+++ b/laptop-nord/.config/alacritty/alacritty.yml
@@ -279,7 +279,7 @@ visual_bell:
 #
 # Window opacity as a floating point number from `0.0` to `1.0`.
 # The value `0.0` is completely transparent and `1.0` is opaque.
-background_opacity: 0.95
+background_opacity: 0.82
 
 selection:
   #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
diff --git a/laptop-nord/.config/dunst/dunstrc b/laptop-nord/.config/dunst/dunstrc
index b692014..beede9b 100644
--- a/laptop-nord/.config/dunst/dunstrc
+++ b/laptop-nord/.config/dunst/dunstrc
@@ -29,7 +29,7 @@
     # the top and down respectively.
     # The width can be negative.  In this case the actual width is the
     # screen width minus the width defined in within the geometry option.
-    geometry = "400x10-10+40"
+    geometry = "400x10-8+43"
 
     # Show how many messages are currently hidden (because of geometry).
     indicate_hidden = yes
@@ -86,7 +86,7 @@
 
     ### Text ###
 
-    font = Fira Code Nerd Font 12
+    font = FiraCode Nerd Font Mono 10
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.
@@ -97,7 +97,7 @@
     #        <b>bold</b>
     #        <i>italic</i>
     #        <s>strikethrough</s>
-    #        <u>underline</u>
+    #        <u>underline</u3
     #
     #        For a complete reference see
     #        <http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>.
@@ -130,7 +130,7 @@
 
     # Alignment of message text.
     # Possible values are "left", "center" and "right".
-	alignment = center
+    alignment = left
     vertical_alignment = center
 
     # Show age of message if message is older than show_age_threshold
@@ -254,22 +254,22 @@
 [urgency_low]
     # IMPORTANT: colors have to be defined in quotation marks.
     # Otherwise the "#" and following would be interpreted as a comment.
-    background = "#1d1f28"
-    foreground = "#fdfdfd"
+    background = "#2E3440"
+    foreground = "#e5e9f0"
     timeout = 10
     # Icon for notifications with low urgency, uncomment to enable
     #icon = /path/to/icon
 
 [urgency_normal]
-    background = "#1d1f28"
-    foreground = "#fdfdfd"
+    background = "#2E3440"
+    foreground = "#e5e9f0"
     timeout = 10
     # Icon for notifications with normal urgency, uncomment to enable
     #icon = /path/to/icon
 
 [urgency_critical]
     background = "#f37f97"
-    foreground = "#1d1f28"
+    foreground = "#e5e9f0"
     timeout = 0
     # Icon for notifications with critical urgency, uncomment to enable
     #icon = /path/to/icon
@@ -315,7 +315,7 @@
 #
 # NOTE: if you don't want a notification to be displayed, set the format
 # to "".
-# NOTE: It might be helpful to run dunst -print in a terminal in order
+# NOTE: It might be help#e5e9f0ful to run dunst -print in a terminal in order
 # to find fitting options for rules.
 
 #########################################################
diff --git a/laptop-nord/.config/i3/config b/laptop-nord/.config/i3/config
index f139653..860c1d1 100644
--- a/laptop-nord/.config/i3/config
+++ b/laptop-nord/.config/i3/config
@@ -1,17 +1,5 @@
 set $mod Mod4
 
-# Colors from https://www.nordtheme.com/
-set $nord0 '#2e3440'
-
-set $blue1 '#88c0d0'
-set $blue3 '#5E81AC'
-
-set $frost0 '#d8dee9'
-set $frost2 '#eceff4'
-
-set $green '#A3BE8C'
-set $red '#bf616a'
-
 # Font for Window Titles
 font pango:FiraCode Nerd Font Mono 8
 
@@ -33,7 +21,7 @@ bindsym $mod+Ctrl+Return exec --no-startup-id xterm
 bindsym $mod+Shift+BackSpace exec "~/scripts/lock-laptop.sh"
 
 # Exit Session
-bindsym $mod+Shift+e exec "i3-msg exit"
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'Logout?' -B 'Yes!' 'i3-msg exit'"
 
 # Windows
 bindsym $mod+h focus left
@@ -69,7 +57,11 @@ bindsym $mod+p workspace prev
 
 # Rofi and dmenu
 bindsym $mod+space exec "~/.config/rofi/launchers-git/launcher.sh"
-bindsym $mod+d exec "dmenu_run -fn 'FiraCode Nerd Font Mono' -nb $nord0 -sb $green -nf $frost2  -sf $frost2
+
+set $nord0d '#2e3440'
+set $frost2d '#eceff4'
+set $greend '#A3BE8C'
+bindsym $mod+d exec "dmenu_run -fn 'FiraCode Nerd Font Mono' -nb #2e3440 -sb #a3be8c -nf #eceff4 -sf #2e3440"
 
 #bindsym --release $mod+Shift+p exec"import ~/screenshots/Screenshot-$(date '+%Y%m%d-%H%M%S').png"
 bindsym $mod+Shift+p exec "flameshot gui"
@@ -133,16 +125,24 @@ bindsym $mod+Shift+r restart
 new_window 1pixel
 for_window [class="^.*"] border pixel 0
 
-# class                 border  backgr. text    indicator child_border
-client.focused          $blue3  $blue3 $frost2 $blue3    $blue3
-client.focused_inactive $nord0  $blue3 $nord0  $nord0    $nord0
-client.unfocused        $nord0  $nord0 $frost0 $blue1    $nord0
-client.urgent           $red    $red   $frost2 $red      $red
-client.background       #ffffff
+# Colors from https://www.nordtheme.com/
+set $nord0 "#2e3440"
 
-exec "~/scripts/startup-laptop.sh"
-# i3 doesnt let me put this in the startscript
-exec_always --no-startup-id ~/.config/polybar/launch.sh &amp;
+set $blue1 "#88c0d0"
+set $blue3 "#5E81AC"
+
+set $frost0 "#d8dee9"
+set $frost2 "#eceff4"
+
+set $green "#A3BE8C"
+
+set $red "#bf616a" 
+# class                 border  backgr.text    indic. child_border
+client.focused          $nord0  $nord0 $frost2 $nord0 $nord0
+client.focused_inactive $nord0  $blue3 $nord0  $nord0 $nord0
+client.unfocused        $nord0  $nord0 $frost0 $blue1 $nord0
+client.urgent           $red    $red   $frost2 $red   $red
+client.background       #ffffff
 
 # Monitors
 set $monitor1 "eDP-1"
@@ -154,3 +154,12 @@ gaps top 35
 
 bindsym $mod+Ctrl+1 move workspace to output $monitor1
 bindsym $mod+Ctrl+2 move workspace to output $monitor2
+
+# Keyboard layout
+exec setxkbmap -layout za
+
+# Start programs
+exec feh --bg-scale $HOME/data/wallpaper/wallpaper.png
+exec dunst &
+exec picom --experimental-backends
+exec --no-startup-id ~/.config/polybar/launch.sh &amp
diff --git a/laptop-nord/.config/picom.conf b/laptop-nord/.config/picom.conf
index 6dc0e1f..d46ee48 100644
--- a/laptop-nord/.config/picom.conf
+++ b/laptop-nord/.config/picom.conf
@@ -4,9 +4,13 @@ opacity-rule = [
     "95:class_g *?= 'XTerm'",
 ];
 
-corner-radius = 15;
+inactive-dim = 0.2;
 
-#blur: {
-#    method: "gaussian";
-#    strength = 7;
-#}
+backend = "glx";
+blur: {
+    method: "dual_kawase";
+    strength = 7;
+    background = false;
+    background-frame = false;
+    background-fixed = false;
+}
diff --git a/laptop-nord/.config/polybar/config b/laptop-nord/.config/polybar/config
index d506b0e..9a50751 100644
--- a/laptop-nord/.config/polybar/config
+++ b/laptop-nord/.config/polybar/config
@@ -43,7 +43,7 @@ radius = 12
 height = 27px
 
 foreground = ${colors.foreground}
-background = ${colors.nord0}
+background = #d12e3440
 
 module-margin= 0
 
@@ -78,15 +78,17 @@ modules-center = spotify
 ################################################################################
 [bar/status]
 inherit = bar/global
-width = 25%
+width = 31%
 
 override-redirect = true
 fixed-center = true
 
-offset-x = 75%:-8px
+offset-x = 69%:-8px
 offset-y = 8px
 
-modules-center = backlight volume battery date
+#tray-position = left
+
+modules-center = update backlight volume battery network date
 
 ###############################################################################
 [module/i3]
@@ -98,15 +100,29 @@ wrapping-scroll = false
 format = <label-state> <label-mode>
 
 foreground = ${colors.foreground}
-background = ${colors.nord0}
 
-label-focused = ""
+ws-icon-0 = 1;一
+ws-icon-1 = 2;二
+ws-icon-2 = 3;三
+ws-icon-3 = 4;四
+ws-icon-4 = 5;五
+ws-icon-5 = 6;六
+ws-icon-6 = 7;七
+ws-icon-7 = 8;八
+ws-icon-8 = 9;九
+ws-icon-9 = 10;十
+ws-icon-default = 
+
+#label-focused = ""
+label-focused = "%icon%"
 label-focused-padding = 1
 
-label-unfocused = ""
+#label-unfocused = ""
+label-unfocused = "%icon%"
+label-unfocused-foreground = ${colors.nord3}
 label-unfocused-padding = 1
 
-label-urgent = ""
+label-urgent = "%icon%"
 label-urgent-foreground = ${colors.red}
 label-urgent-padding = 1
 
@@ -115,12 +131,12 @@ label-urgent-padding = 1
 type = internal/date
 
 format-padding = 1
-format-background = ${colors.background}
 
 interval = 1.0
 
-time =  %I:%M %p - %A, %d %B %Y
-time-alt =  %I:%M %p
+#time =  %I:%M %p - %A, %d %B %Y
+time =  %I:%M %p - %d.%m.%Y
+time-alt =  %I:%M %p
 
 format = <label>
 
@@ -141,9 +157,6 @@ type = internal/cpu
 
 interval = 5
 
-format-background = ${colors.frost1}
-format-foreground = ${colors.nord0}
-
 format = <label>
 format-prefix = 
 format-padding = 1
@@ -168,18 +181,13 @@ full-at = 99
 battery = BAT0
 apdapter = ADP1
 
-bg = ${colors.background}
-
 format-charging = <animation-charging> <label-charging>
-format-charging-background = ${self.bg}
 format-charging-padding = 1
 
 format-discharging = <ramp-capacity> <label-discharging>
-format-discharging-background = ${self.bg}
 format-discharging-padding = 1
 
 format-full = <ramp-capacity> <label-full>
-format-full-background = ${self.bg}
 format-full-padding = 1
 
 label-charging = %percentage%%
@@ -211,7 +219,6 @@ animation-charging-framerate = 750
 [module/volume]
 type = internal/pulseaudio
 
-format-volume-background = ${colors.background}
 format-volume-padding = 1
 
 format-volume = <ramp-volume> <label-volume>
@@ -240,12 +247,11 @@ interval = 1.0
 accumulate-stats = true
 unknown-as-up = true
 
-format-connected = <ramp-signal> <label-connected>
-format-connected-background = ${colors.nord1}
+#format-connected = <ramp-signal> <label-connected>
+format-connected =  <label-connected>
 format-connected-padding = 1
 
 format-disconnected = <label-disconnected>
-format-disconnected-background = ${colors.nord1}
 format-disconnected-padding = 1
 
 label-connected = %essid%
@@ -263,8 +269,6 @@ ramp-signal-4 = 
 type = internal/backlight
 
 format-padding = 1
-format-background = ${colors.background}
-format-foreground = ${colors.foreground}
 
 # ls -1 /sys/class/backlight
 card = amdgpu_bl0
@@ -298,8 +302,6 @@ interval = 2
 type = custom/script
 
 format-padding = 1
-format-background = ${colors.green}
-format-foreground = ${colors.nord0}
 
 exec = ~/.config/polybar/scripts/hostname.sh
 tail = true
@@ -310,8 +312,6 @@ interval = 60
 type = custom/script
 
 format-padding = 1
-format-background = ${colors.nord0}
-format-foreground = ${colors.foreground}
 format-prefix = "直 "
 
 exec = ~/.config/polybar/scripts/ip.sh
@@ -319,13 +319,9 @@ tail = true
 interval = 20
 
 ###############################################################################
-[module/powerbutton]
-type = custom/text
-
-content-padding = 1
-content-background = ${colors.nord1}
-content-foreground = ${colors.frost2}
-
-content = "襤"
-
-click-left = ~/scripts/powermenu
+[module/update]
+type = custom/script
+exec = echo ' '
+interval = 5
+tail = true
+click-left = alacritty -e bash -c "echo 'Upgrading packages...' && sudo dnf upgrade"
diff --git a/laptop-nord/.gitconfig b/laptop-nord/.gitconfig
index f43c45b..807331c 100644
--- a/laptop-nord/.gitconfig
+++ b/laptop-nord/.gitconfig
@@ -7,7 +7,7 @@
 	sh = show
 	d = diff
 	c = commit -v
-	ca = commmit -v --amend
+	ca = commit -v --amend
 	co = checkout
 	b = branch
 	l = pull
diff --git a/laptop-nord/.vimrc b/laptop-nord/.vimrc
index 0781051..500f9b4 100644
--- a/laptop-nord/.vimrc
+++ b/laptop-nord/.vimrc
@@ -1,20 +1,27 @@
+" ▄▄   ▄▄ ▄▄▄▄▄▄ ▄▄▄▄▄▄   ▄▄▄▄▄▄▄ ▄▄  ▄▄▄▄▄▄▄    ▄▄   ▄▄ ▄▄▄ ▄▄   ▄▄ ▄▄▄▄▄▄   ▄▄▄▄▄▄▄
+" █  █▄█  █      █   ▄  █ █       █  ██       █  █  █ █  █   █  █▄█  █   ▄  █ █       █
+" █       █  ▄   █  █ █ █ █       █▄▄██  ▄▄▄▄▄█  █  █▄█  █   █       █  █ █ █ █       █
+" █       █ █▄█  █   █▄▄█▄█     ▄▄█   █ █▄▄▄▄▄   █       █   █       █   █▄▄█▄█     ▄▄█
+" █       █      █    ▄▄  █    █      █▄▄▄▄▄  █  █       █   █       █    ▄▄  █    █
+" █ ██▄██ █  ▄   █   █  █ █    █▄▄     ▄▄▄▄▄█ █   █     ██   █ ██▄██ █   █  █ █    █▄▄
+" █▄█   █▄█▄█ █▄▄█▄▄▄█  █▄█▄▄▄▄▄▄▄█   █▄▄▄▄▄▄▄█    █▄▄▄█ █▄▄▄█▄█   █▄█▄▄▄█  █▄█▄▄▄▄▄▄▄█
+"
+
 let mapleader = "\<Space>"
-" ------------------------------------- Vundle Setup ---------------------------
+
+" ============================== Plugins
 set nocompatible
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 
 Plugin 'VundleVim/Vundle.vim'
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Show git changes
 Plugin 'airblade/vim-gitgutter'
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Automatic intendations
 Plugin 'tpope/vim-sleuth'
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Match parents
 Plugin 'tmsvg/pear-tree'
 
@@ -31,13 +38,13 @@ let g:pear_tree_pairs = {
             \ '<': {'closer': '>'}
             \ }
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Helper for latex
 Plugin 'lervag/vimtex'
 
 let g:vimtex_view_general_viewer = 'zathura'
+nmap <C-c> :VimtexCompile <CR>
+nmap <C-t> :VimtexTocToggle <CR>
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " fzf
 if executable("fzf")
     Plugin 'junegunn/fzf'
@@ -46,70 +53,58 @@ if executable("fzf")
     nmap <C-f> :Files<CR>
 endif
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Colors
 Plugin 'arcticicestudio/nord-vim'
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
 
-let g:airline_theme='nord'
-let g:airline_powerline_fonts = 1
-let g:bufferline_echo = 0
-set guifont="FiraCode Nerd Font Mono"
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 call vundle#end()
 filetype plugin indent on
 
-" ------------------------------------- Colors ---------------------------------
+" ============================== Colors
 syntax on
 colorscheme nord
-set colorcolumn=81
 filetype indent plugin on
 
-" ------------------------------------- General --------------------------------
+" ============================== General
 set number
 set relativenumber
-":highlight LineNr ctermfg=white "color
-set showmatch " Highlights paranthesis
+
+set showmatch " highlights paranthesis
 set mat=5
-set noswapfile
+set noswapfile " can be problamatic on some systems
 set confirm " can't quit without saving
 set noshowmode " don't show mode in status
 set noshowcmd " don't show command in status
-"set cursorline " highlight cursorline
 set encoding=utf-8
 set mouse=c
-set undolevels=1337
+set undolevels=1337 " memegods can make mistakes
 set backspace=indent,eol,start
 set wildmenu " autocomplete :e
 
-" ------------------------------------- Indents & Whitespaces ------------------
+" ============================== Indents and Whitespaces
 set list
 set listchars=tab:»\ ,extends:›,precedes:‹,nbsp:·,trail:·
 
-" ------------------------------------- Search ---------------------------------
+highlight ExtraWhitespace ctermbg=red guibg=red
+match ExtraWhitespace /\s\+\%#\@<!$/
+
+" ============================== Search
 set incsearch
 set ignorecase
-set smartcase " case sensitive with capital letters
+set smartcase " case sensitive when capital letters are used
 set hlsearch " highlight all results
 nnoremap<leader><space> :nohlsearch<CR>
 
-" ------------------------------------- Cursor ---------------------------------
+" ============================== Cursor Thiccness
 let &t_SI = "\<Esc>[6 q"
 let &t_SR = "\<Esc>[4 q"
 let &t_EI = "\<Esc>[2 q"
 
-" ------------------------------------- vimtex ---------------------------------
-nmap <C-c> :VimtexCompile <CR>
-nmap <C-t> :VimtexTocToggle <CR>
-
-" ------------------------------------- netrw ----------------------------------
+" ============================== netrw
 let g:netrw_winsize = 25
 let g:netrw_liststyle = 3 " Tree-like structure
 let g:netrw_banner = 0 " Remove useless banner at the top of netrw
 
-" ------------------------------------- Macros & Mappings ----------------------
+" ============================== Macros and Mappings
 cmap Wq wq
 cmap Q q
 cmap W w
diff --git a/laptop-nord/scripts/startup-laptop.sh b/laptop-nord/scripts/startup-laptop.sh
index a325f6e..023b340 100755
--- a/laptop-nord/scripts/startup-laptop.sh
+++ b/laptop-nord/scripts/startup-laptop.sh
@@ -1,12 +1,4 @@
 #!/bin/sh
 
-setxkbmap -layout za
-
-export LANG="en_US.UTF-8"
-export LANGUAGE="en_US.UTF-8"
-
-feh --bg-scale $HOME/data/wallpaper/wallpaper.png
-
-nm-applet &
 dunst &
 picom &
diff --git a/screenshots/home.png b/screenshots/home.png
index 8003a35..316cda6 100644
Binary files a/screenshots/home.png and b/screenshots/home.png differ