diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 52959d1..44a97d8 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -1,33 +1,48 @@
-# Colors (Tomorrow Night)
 colors:
   # Default colors
   primary:
-    background: '0x1d1f21'
-    foreground: '0xc5c8c6'
+    background: '0x2c2c2c'
+    foreground: '0xd6d6d6'
 
-  # Colors the cursor will use if `custom_cursor_colors` is true
+    dim_foreground:    '0xdbdbdb'
+    bright_foreground: '0xd9d9d9'
+    dim_background:    '0x202020' # not sure
+    bright_background: '0x3a3a3a' # not sure
+
+  # Cursor colors
   cursor:
-    text: '0x1d1f21'
-    cursor: '0xffffff'
+    text:   '0x2c2c2c'
+    cursor: '0xd9d9d9'
 
   # Normal colors
   normal:
-    black:   '0x1d1f21'
-    red:     '0xcc6666'
-    green:   '0xb5bd68'
-    yellow:  '0xe6c547'
-    blue:    '0x81a2be'
-    magenta: '0xb294bb'
-    cyan:    '0x70c0ba'
-    white:   '0x373b41'
+    black:   '0x1c1c1c'
+    red:     '0xbc5653'
+    green:   '0x909d63'
+    yellow:  '0xebc17a'
+    blue:    '0x7eaac7'
+    magenta: '0xaa6292'
+    cyan:    '0x86d3ce'
+    white:   '0xcacaca'
 
   # Bright colors
   bright:
-    black:   '0x666666'
-    red:     '0xff3334'
-    green:   '0x9ec400'
-    yellow:  '0xf0c674'
-    blue:    '0x81a2be'
-    magenta: '0xb77ee0'
-    cyan:    '0x54ced6'
-    white:   '0x282a2e'
+    black:   '0x636363'
+    red:     '0xbc5653'
+    green:   '0x909d63'
+    yellow:  '0xebc17a'
+    blue:    '0x7eaac7'
+    magenta: '0xaa6292'
+    cyan:    '0x86d3ce'
+    white:   '0xf7f7f7'
+
+  # Dim colors
+  dim:
+    black:   '0x232323'
+    red:     '0x74423f'
+    green:   '0x5e6547'
+    yellow:  '0x8b7653'
+    blue:    '0x556b79'
+    magenta: '0x6e4962'
+    cyan:    '0x5c8482'
+    white:   '0x828282'
diff --git a/bashrc/.bashrc b/bashrc/.bashrc
index 44af4e2..7513a6a 100644
--- a/bashrc/.bashrc
+++ b/bashrc/.bashrc
@@ -141,4 +141,6 @@ ex ()
 alias weather="curl wttr.in"
 alias ll="ls -la"
 
+EDITOR=vim
+
 pfetch
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index ae810f3..cb055bb 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -112,11 +112,11 @@ bindsym $mod+a focus parent
 
 # Define names for default workspaces for which we configure key bindings later on.
 # We use variables to avoid repeating the names in multiple places.
-set $ws1 "1: Terminal"
-set $ws2 "2: Web"
-set $ws3 "3: Chat"
-set $ws4 "4: Dev"
-set $ws5 "5: Music"
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
 set $ws6 "6"
 set $ws7 "7"
 set $ws8 "8"
@@ -189,13 +189,15 @@ bindsym $mod+r mode "resize"
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-        status_command i3status
+	position top
+        status_command i3blocks
 	output HDMI-0
 	output HDMI-1
+	font pango:DejaVu Sans Mono 10
 }
 
 # set background on startup
-exec --no-startup-id feh --bg-fill ~/Pictures/mountains.jpg
+exec --no-startup-id feh --bg-fill ~/Pictures/mountains2.jpg
 
 # turn picom on on start up
 exec_always --no-startup-id picom &
diff --git a/i3blocks/.config/i3blocks/config b/i3blocks/.config/i3blocks/config
new file mode 100644
index 0000000..0608bba
--- /dev/null
+++ b/i3blocks/.config/i3blocks/config
@@ -0,0 +1,22 @@
+[packages]
+command=~/.scripts/i3blocks/pacman.sh
+interval=3600
+
+[weather]
+command=~/.scripts/i3blocks/weather.sh
+interval=3600
+color=#A4C2F4
+
+[ip]
+command=~/.scripts/i3blocks/ip.sh
+interval=once
+color=#91E78Bcolor=#A4C2F4
+
+[wifi]
+command=~/.scripts/i3blocks/wifi.sh
+interval=3600
+
+[time]
+command=date | awk '{ print "📅 " $0 }'
+interval=5
+
diff --git a/mountains2.jpg b/mountains2.jpg
new file mode 100755
index 0000000..80b4255
Binary files /dev/null and b/mountains2.jpg differ
diff --git a/ranger/.config/ranger/rc.conf b/ranger/.config/ranger/rc.conf
index fc4f5d1..7d6e25f 100644
--- a/ranger/.config/ranger/rc.conf
+++ b/ranger/.config/ranger/rc.conf
@@ -70,7 +70,7 @@ set vcs_backend_svn disabled
 set vcs_msg_length 50
 
 # Use one of the supported image preview protocols
-set preview_images false
+set preview_images true
 
 # Set the preview image method. Supported methods:
 #
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100644
index 0000000..be83b31
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,18 @@
+# Use powerline
+USE_POWERLINE="true"
+# Source manjaro-zsh-configuration
+if [[ -e /usr/share/zsh/manjaro-zsh-config ]]; then
+  source /usr/share/zsh/manjaro-zsh-config
+fi
+# Use manjaro zsh prompt
+if [[ -e /usr/share/zsh/manjaro-zsh-prompt ]]; then
+  source /usr/share/zsh/manjaro-zsh-prompt
+fi
+
+
+alias cp="cp -i"
+alias more="less"
+alias weather="curl wttr.in"
+alias ll="ls -la"
+
+pfetch