diff --git a/i3wm/config b/i3wm/config
index e2b06b0..26727f2 100644
--- a/i3wm/config
+++ b/i3wm/config
@@ -1,19 +1,9 @@
-#######################################
-#  _____  ____                        #
-# |_   _||___ \                       #
-#   | |    __) |__      __ _ __ ___   #
-#   | |   |__ < \ \ /\ / /| '_ ` _ \  #
-#  _| |_  ___) | \ V  V / | | | | | | #
-# |_____||____/   \_/\_/  |_| |_| |_| #
-#                                     #
-#######################################
-
 #############################################
 #         General configurations            #
 #############################################
 
 # font
-set $font "pango:Droid Sans Mono for Powerline 10"
+set $font "pango:RobotoMono 12"
 font $font
 
 # floating modifier
@@ -22,19 +12,16 @@ font $font
 set $mod mod4
 floating_modifier $mod
 
-# remove window decorations
-#new_window pixel
-
-# focus follows mouse
-focus_follows_mouse yes
-
 #gaps
 gaps inner 13
 gaps outer 5
-#
-##border
+
+###border
 new_window pixel 3
 
+# focus follows mouse
+focus_follows_mouse yes
+
 
 #############################################
 #              Script Section               #
@@ -44,25 +31,22 @@ new_window pixel 3
 # "xev" and "showkeys" can be usefull to determine the keycodes.
 # 
 
-# sound softkeys management
-bindsym XF86AudioRaiseVolume    exec ~/.i3/util/volnotid.sh up
-bindsym XF86AudioLowerVolume    exec ~/.i3/util/volnotid.sh down
-bindsym XF86AudioMute           exec ~/.i3/util/volnotid.sh mute
+# Sound softkeys management
+bindsym Print                   exec ~/.i3/util/volnotid.sh down
+bindsym Scroll_Lock             exec ~/.i3/util/volnotid.sh up
+bindsym Pause                   exec ~/.i3/util/volnotid.sh mute
 
-# display brightness management
+# Display brightness management
 bindsym XF86MonBrightnessUp     exec "xbacklight +10"
 bindsym XF86MonBrightnessDown   exec "xbacklight -10"
 
-# webcam
-bindym XF86WebCam               exec /bin/cheese
-
-# lenovo Key wifi-menu
+# Lenovo Key wifi-menu
 bindsym XF86Launch1             exec  urxvt -e sh -c "sudo wifi-menu wlp3s0"
 
 # jauth two factor authenticator
-bindsym $mod+F1                 exec /opt/JAuth/authenticator.sh google
-bindsym $mod+F2                 exec /opt/JAuth/authenticator.sh facebook
-bindsym $mod+F3                 exec /opt/JAuth/authenticator.sh dropbox
+bindsym $mod+F1                 exec ~/.i3/util/authenticator.sh google
+bindsym $mod+F2                 exec ~/.i3/util/authenticator.sh facebook
+bindsym $mod+F3                 exec ~/.i3/util/authenticator.sh dropbox
 
 # start dmenu-launcher
 bindsym $mod+d                  exec ~/.i3/util/i3dmenu-wrapper.sh
@@ -188,8 +172,8 @@ mode "resize" {
 }
 
 #############################################
-#                 Colors                    #
-#############################################
+##                 Colors                    #
+##############################################
 
 # Darkbrown colorscheme
 set $DARKBROWN      #402e2e
@@ -198,10 +182,10 @@ set $DARKGREY       #1f1f1f
 set $DARKRED        #9b0e0e
 
 # Solarized colorscheme
-set $BACKGROUND     #002b36
+set $BACKGROUND     #20444d
 set $FOREGROUND     #93a1a1
 set $LIGHTGREY      #dc322f
-set $GREEN          #859900
+set $GREEN          #b0cc54
 set $BROWN          #b58900
 set $BLUE           #268bd2
 set $VIOLET         #6c71c4
@@ -218,11 +202,13 @@ client.background       #ffffff
 #client.urgent           $DARKBROWN  $DARKBROWN   $LIGHTBROWN  $LIGHTBROWN  $DARKBROWN
 
 # Solarized colorscheme
-# name                  #border      #background   #text         #indicator   #child_border
-client.focused          $MAGENTA     $BACKGROUND   $GREEN        $GREEN       $MAGENTA
-client.unfocused        $BACKGROUND  $BACKGROUND   $GREEN        $GREEN       $BACKGROUND
-client.focused_inactive $BACKGROUND  $BACKGROUND   $GREEN        $GREEN       $BACKGROUND
-client.urgent           $BACKGROUND  $BACKGROUND   $BACKGROUND   $GREEN       $BACKGROUND
+# name                  #border     #background #text       #indicator #child_border
+client.focused          $MAGENTA    $BACKGROUND $GREEN      $GREEN     $MAGENTA
+client.unfocused        $BACKGROUND $BACKGROUND $GREEN      $GREEN     $BACKGROUND
+client.focused_inactive $BACKGROUND $BACKGROUND $GREEN      $GREEN     $BACKGROUND
+client.urgent           $BACKGROUND $BACKGROUND $BACKGROUND $GREEN     $BACKGROUND
+
+
 
 #############################################
 #                 i3-bar                    #
@@ -233,22 +219,9 @@ bar {
     font                    $font
     i3bar_command           /usr/bin/i3bar
     status_command          i3status -c ~/.i3/i3status.conf
-    separator_symbol        ".::"
-
-# Darkbrown colorscheme
-#    colors {
-#        statusline  $LIGHTBROWN
-#        background  $DARKGREY
-#        separator   $DARKRED
-#
-#        # name             #border      #bg         #text
-#        focused_workspace  $LIGHTBROWN  $DARKBROWN  $LIGHTBROWN
-#        active_workspace   $DARKBROWN   $DARKBROWN  $LIGHTBROWN
-#        inactive_workspace $DARKBROWN   $DARKBROWN  $LIGHTBROWN
-#        urgent_workspace   $DARKBROWN   $DARKBROWN  $LIGHTBROWN
-#  }
-
-# Solarized colorscheme
+    separator_symbol        "  "
+    
+    # Solarized colorscheme
     colors {
         statusline  $GREEN
         background  $BACKGROUND
@@ -259,7 +232,7 @@ bar {
         active_workspace   $BACKGROUND $BACKGROUND $GREEN
         inactive_workspace $BACKGROUND $BACKGROUND $GREEN
         urgent_workspace   $BACKGROUND $BACKGROUND $GREEN
-  }
+    }
 }
 
 #############################################
@@ -277,7 +250,6 @@ for_window [class="teamspeak3"]     floating enable
 for_window [class="rhythmbox"]      floating enable
 for_window [class="LibreOffice"]    floating enable
 for_window [class="JAuth"]          floating enable
-for_window [class="plecs"]          floating enable
 
 # 0px Border 
 for_window [class="chrome"]         border none
@@ -290,36 +262,33 @@ for_window [class="URxvt" ]         border 1pixel
 #            auto start with i3             #
 #############################################
 
-# terminal daemon
-exec --no-startup-id urxvtd -f
-
 # less eye pain
 exec --no-startup-id redshift-gtk
-exec --no-startup-id compton -cCGb
+exec --no-startup-id compton --config ~/.compton.conf
 
-# no beep!
+# fucking no beep!
 exec --no-startup-id xset b off
 
 # set dpi for my monitor
-#exec --no-startup-id xrandr --dpi 81
+exec --no-startup-id xrandr --dpi 81
 
 # set mouse accel
-#exec --no-startup-id xset m 1/4 1
+exec --no-startup-id xset m 1/4 1
 
 # volnoti volume changer
 exec --no-startup-id volnoti
 
 # numlock on by default
-#exec --no-startup-id numlockx on
+exec --no-startup-id numlockx on
 
 # wallpapers
-exec --no-startup-id ~/.i3/util/wallpapers.sh
+exec --no-startup-id nitrogen --restore
 
 # archlinux update notifier
 exec --no-startup-id aarchup
 
-# telegram
-exec telegram-desktop
-
 # dropbox daemon
 exec dropbox start
+
+# telegram
+exec /bin/telegram-desktop
diff --git a/i3wm/i3status.conf b/i3wm/i3status.conf
index e41a7bd..552264a 100644
--- a/i3wm/i3status.conf
+++ b/i3wm/i3status.conf
@@ -1,18 +1,9 @@
-########################################
-#  _ ____      _        _              #
-# (_)___ \    | |      | |             #
-#  _  __) |___| |_ __ _| |_ _   _ ___  #
-# | ||__ </ __| __/ _` | __| | | / __| #
-# | |___) \__ \ || (_| | |_| |_| \__ \ #
-# |_|____/|___/\__\__,_|\__|\__,_|___/ #
-#                                      #
-########################################
-#
 # i3status configuration file.
 # see "man i3status" for documentation.
-#
+
 # It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s: ß
+# The following line should contain a sharp s:
+# ß
 # If the above line is not correctly displayed, fix your editor first!
 
 general {
@@ -20,35 +11,24 @@ general {
         interval = 1
 }
 
-order += "battery 0"
+#order += "ipv6"
 order += "disk /home"
 order += "disk /"
+order += "disk /media/Data1"
+order += "disk /media/Data2"
 order += "run_watch VPN"
-order += "wireless wlp3s0"
+order += "ethernet eth0"
 order += "cpu_temperature 0"
 order += "volume master"
 order += "tztime local"
 
-wireless wlp3s0 {
-        format_up = "📡 (%quality @ %essid, %bitrate) %ip"
-        format_down = "📡 down"
-}
-
-ethernet enp0s25 {
+ethernet eth0 {
         format_up = "🔌  %ip (%speed)"
         format_down = "🔌  down"
 }
 
-battery 0 {
-        format = "%status %percentage (%remaining @ %consumption)"
-        format_down = "No battery"
-        last_full_capacity = false # true: relative capaciy, false: true capacity left
-        status_chr = "⚇ CHR"
-        status_bat = "⚡ BAT"
-        status_full = "☻ FULL"
-        path = "/sys/class/power_supply/BAT%d/uevent"
-        threshold_type = time
-        low_threshold = 10
+run_watch DHCP {
+        pidfile = "/var/run/dhclient*.pid"
 }
 
 run_watch VPN {
@@ -61,18 +41,24 @@ tztime local {
 
 cpu_temperature 0 {
     format = "🌡 %degrees °C"
-    max_threshold = 70
-    path = "/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input"
-}
-
-disk "/home" {
-    format = "/home %free"
-    prefix_type = "binary"
+    max_threshold = 65
+    path = "/sys/devices/platform/coretemp.0/hwmon/hwmon1/temp1_input"
 }
 
 disk "/" {
-    format = "root %free"
-    prefix_type = "binary"
+        format = "root: %free"
+}
+
+disk "/home" {
+        format = "home: %free"
+}
+
+disk "/media/Data1" {
+        format = "data1: %free"
+}
+
+disk "/media/Data2" {
+        format = "data2: %free"
 }
 
 volume master {
diff --git a/i3wm/util/authenticator.sh b/i3wm/util/authenticator.sh
index 471ded9..c8cb069 100755
--- a/i3wm/util/authenticator.sh
+++ b/i3wm/util/authenticator.sh
@@ -18,9 +18,9 @@
 # yaourt -S jauth-git
 #
 
-SECRET_GOOGLE="asdf"
-SECRET_FACEBOOK="asdf"
-SECRET_DROPBOX="asdf"
+SECRET_GOOGLE="There"
+SECRET_FACEBOOK="IsJust"
+SECRET_DROPBOX="NoWayImUploadingThisToGit"
 
 ARG="${1}"
 
diff --git a/setup.sh b/setup.sh
index 8c17ea4..3a7927e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -36,9 +36,7 @@ BAKFILES=".i3
           .zshrc
           .tmux.conf
           .vimrc
-          .Xdefaults
-          .ncmpcpp/config
-          .mpd/mpd.conf"
+          .Xdefaults"
 
 BAKFOLD="$HOME/.dotfilebackup"
 
@@ -61,9 +59,8 @@ if [ "$1" == "clean" ]; then
 fi
 
 # Clone the repository if it doesn't exist 
-if [ ! -e $DOTFILES  ]; then
+if [ ! -e "$HOME/.dotfiles/"  ]; then
     git clone https://github.com/id101010/LinuxDotFiles.git $DOTFILES
-    rm -rf $DOTFILES/.git
 fi
 
 # ------------------------------------------------ Setup I3wm
@@ -83,9 +80,3 @@ ln -sfv $DOTFILES/urxvt/Xdefaults $HOME/.Xdefaults
 
 # ------------------------------------------------ Setup wallpapers
 ln -sfv $DOTFILES/wallpapers/ $HOME/.wallpapers
-
-# ------------------------------------------------ Setup mpd
-ln -sfv $DOTFILES/mpd/ $HOME/.mpd
-
-# ------------------------------------------------ Setup ncmpcpp
-ln -sfv $DOTFILES/ncmpcpp/ $HOME/.ncmpcpp
diff --git a/urxvt/Xdefaults b/urxvt/Xdefaults
index 8e32aa8..28857e1 100644
--- a/urxvt/Xdefaults
+++ b/urxvt/Xdefaults
@@ -8,9 +8,12 @@
 #                              #
 ################################
 
+Xcursor.theme: adwaita
+Xcursor.size: 16
+
 # Real transparency         -> needs composite manager
 URxvt.depth:                32
-URxvt.background:           rgba:0000/0000/0200/cfff
+URxvt.background:           rgba:0000/0000/0200/afff
 
 # Fake transparency
 #URxvt.transparent:          true
diff --git a/wallpapers/solarized5.png b/wallpapers/solarized5.png
new file mode 100644
index 0000000..734f2e2
Binary files /dev/null and b/wallpapers/solarized5.png differ
diff --git a/wallpapers/solarized6.png b/wallpapers/solarized6.png
new file mode 100644
index 0000000..552b6a5
Binary files /dev/null and b/wallpapers/solarized6.png differ
diff --git a/wallpapers/solarized7.png b/wallpapers/solarized7.png
new file mode 100644
index 0000000..378e626
Binary files /dev/null and b/wallpapers/solarized7.png differ
diff --git a/zsh/zshrc b/zsh/zshrc
index b08b511..c9f3f78 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -120,3 +120,4 @@ setopt pushdminus
 setopt nohashdirs
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 rehash
+source ~/Coding/0_C/Microcontroller/zephyr-project/zephyr-env.sh