diff --git a/README.md b/README.md
index bf269a4..6f6972f 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ My personal configurations, managed with the 'dotdrop' submodule.
 | Usage | Name |
 | :--- | :--- |
 | Distribution | Fedora 31 |
-| Shell | zsh with oh-my-zsh |
+| Shell | zsh + oh-my-zsh |
 | WM | i3 |
 | Terminal | xterm |
 | Font | Inconsolata |
diff --git a/config.yaml b/config.yaml
index 6085e0c..84df6b9 100644
--- a/config.yaml
+++ b/config.yaml
@@ -30,8 +30,6 @@ dotfiles:
   f_i3status_config:
     src: i3status_config
     dst: ~/.config/i3status/config
-    actions:
-    - font-cache
   f_gdbinit:
     src: gdbinit
     dst: ~/.gdbinit
@@ -50,6 +48,8 @@ dotfiles:
   d_fonts:
     src: fonts
     dst: ~/.local/share/fonts
+    actions:
+    - font-cache
   d_xresources_d:
     src: Xresources.d
     dst: ~/.Xresources.d
@@ -59,6 +59,9 @@ dotfiles:
   f_tmux:
     src: tmux.conf
     dst: ~/.tmux.conf
+  d_wallpaper:
+    src: wallpaper
+    dst: ~/.wallpaper
 profiles:
   laptop:
     include:
@@ -70,6 +73,7 @@ profiles:
     - picom
     - tmux
     - gdb
+    - wallpaper
   work:
     include:
     - zsh
@@ -80,6 +84,7 @@ profiles:
     - picom
     - tmux
     - gdb
+    - wallpaper
   dev:
     include:
     - zsh
@@ -118,3 +123,6 @@ profiles:
   tmux:
     dotfiles:
     - f_tmux
+  wallpaper:
+    dotfiles:
+    - d_wallpaper
diff --git a/dotfiles/Xresources b/dotfiles/Xresources
index 55cdc69..4f606b2 100644
--- a/dotfiles/Xresources
+++ b/dotfiles/Xresources
@@ -13,10 +13,10 @@
 ! Font
 XTerm.vt100.faceName: xft:Inconsolata:antialias=true
 {%@@ if profile == "work" @@%}
-XTerm.vt100.faceSize: 13
+XTerm.vt100.faceSize: 12
 {%@@ endif @@%}
 {%@@ if profile == "laptop" @@%}
-XTerm.vt100.faceSize: 15
+XTerm.vt100.faceSize: 14
 {%@@ endif @@%}
 
 ! Remove Scrollbar
diff --git a/dotfiles/i3_config b/dotfiles/i3_config
index f3c98db..efc227a 100644
--- a/dotfiles/i3_config
+++ b/dotfiles/i3_config
@@ -184,7 +184,7 @@ bar {
         #separator #4b5262
         separator #2f343f
 
-        # colour of border, background, and text
+        # class                 border  backgr. text
         focused_workspace       #2f343f #00b111 #d8dee8
         active_workspace        #2f343f #2f343f #d8dee8
         inactive_workspace      #2f343f #2f343f #d8dee8
@@ -193,6 +193,15 @@ bar {
     status_command i3status
 }
 
+# Border
+for_window [class="^.*"] border pixel 2
+# class                 border  backgr. text    indicator child_border
+client.focused          #00b111 #222222 #ffffff #2e9ef4   #00b111
+client.focused_inactive #333333 #5f676a #ffffff #484e50   #5f676a
+client.unfocused        #333333 #222222 #888888 #292d2e   #222222
+client.urgent           #2f343a #900000 #ffffff #900000   #900000
+client.background       #ffffff
+
 # Keyboard lauyout shortcuts
 exec setxkbmap -layout us
 bindsym Ctrl+Shift+1 exec --no-startup-id setxkbmap us
@@ -201,7 +210,10 @@ bindsym Ctrl+Shift+2 exec --no-startup-id setxkbmap de
 # Remove title bar
 new_window 1pixel
 
+# Wallpaper
+exec --no-startup-id feh --bg-scale ~/.wallpaper/wallpaper.jpg
 
+# PC specific configurations:
 {%@@ if profile == "work" @@%}
 # Locking
 bindsym $mod+Shift+b exec "xlock -mode blank -startCmd /share/bin/isweg -endCmd /share/bin/isda"
@@ -227,9 +239,6 @@ bindsym $mod+Ctrl+2 move workspace to output $monitor2
 {%@@ endif @@%}
 
 
-
-
-
 {%@@ if profile == "laptop" @@%}
 # Locking
 bindsym $mod+Shift+b exec "xlock -mode matrix"
@@ -238,7 +247,4 @@ bindsym $mod+Shift+b exec "xlock -mode matrix"
 exec --no-startup-id "firefox"
 
 for_window [class="Firefox"] move container to workspace 9
-
-exec --no-startup-id feh --bg-scale ~/.wallpaper/minimalist-forest.jpg
-exec --no-startup-id picom
 {%@@ endif @@%}
diff --git a/dotfiles/i3status_config b/dotfiles/i3status_config
index ef91324..6e6ee4c 100644
--- a/dotfiles/i3status_config
+++ b/dotfiles/i3status_config
@@ -8,11 +8,9 @@ general {
     color_bad = '#ba5e57'
 }
 
-
+{%@@ if profile == "laptop" @@%} 
 order += "load"
 order += "memory"
-
-{%@@ if profile == "laptop" @@%} 
 order += "cpu_temperature 0"
 order += "ethernet _first_"
 order += "wireless _first_"
diff --git a/dotfiles/picom.conf b/dotfiles/picom.conf
index afec842..0b5372e 100644
--- a/dotfiles/picom.conf
+++ b/dotfiles/picom.conf
@@ -1,36 +1,4 @@
-{%@@ if profile == "laptop" @@%}
 opacity-rule = [
-    "85:class_g = 'XTerm' && !focused",
-    "95:class_g = 'XTerm' && focused",
-];
-{%@@ endif @@%}
-
-{%@@ if profile == "work" @@%}
-opacity-rule = [
-    "90:class_g = 'XTerm' && !focused",
+    "100:class_g = 'XTerm' && !focused",
     "100:class_g = 'XTerm' && focused",
 ];
-{%@@ endif @@%}
-
-wintypes: {
-    dock = { opacity = 0.8; }
-}
-
-#active-opacity = 0.99;
-#inactive-opacity = 0.9;
-
-#blur-background = true;
-#blur-background-fixed = true;
-
-#inactive-dim = 0.05;
-
-#fading = true;
-#fade-delta = 4;
-#fade-in-step = 0.02;
-#fade-out-step = 0.02;
-
-#blur: {
-#    method = "gaussian";
-#    size = 90;
-#    deviation = 10.0;
-#}
diff --git a/dotfiles/wallpaper/wallpaper.png b/dotfiles/wallpaper/wallpaper.png
new file mode 100644
index 0000000..f31288d
Binary files /dev/null and b/dotfiles/wallpaper/wallpaper.png differ
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 98a873e..4e53c98 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -35,6 +35,7 @@ alias fonts="/home/$USER/.local/share/fonts"
 alias listfonts="fc-list :scalable=true:spacing=mono: family"
 alias cachefonts="fc-cache -f -v"
 
+# Allow pc local aliases
 if [ -f ~/.zshaliases_local ]; then
     source ~/.zshaliases_local
 fi