diff --git a/i3/config b/i3/config
new file mode 100644
index 0000000..96f7845
--- /dev/null
+++ b/i3/config
@@ -0,0 +1,163 @@
+# This file has been auto-generated by i3-config-wizard(1).
+# It will not be overwritten, so edit it as you like.
+#
+# Should you change your keyboard layout some time, delete
+# this file and re-run i3-config-wizard(1).
+#
+
+# i3 config file (v4)
+#
+# Please see https://i3wm.org/docs/userguide.html for a complete reference!
+
+set $mod Mod1
+
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below.
+font pango:monospace 8
+
+exec feh --bg-fill /home/david/Pictures/Wallpapers/ellie_full.jpg
+exec setxkbmap -layout gb,ru -variant ,winkeys -option grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp,compose:ralt
+
+
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+#font pango:DejaVu Sans Mono 8
+
+# Before i3 v4.8, we used to recommend this one as the default:
+# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# The font above is very space-efficient, that is, it looks good, sharp and
+# clear in small sizes. However, its unicode glyph coverage is limited, the old
+# X core fonts rendering does not support right-to-left and this being a bitmap
+# font, it doesn’t scale on retina/hidpi displays.
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+bindsym XF86MonBrightnessUp exec xbacklight -inc 10 # increase screen brightness
+bindsym XF86MonBrightnessDown exec xbacklight -dec 10 # decrease screen brightness
+
+# start a terminal
+bindsym $mod+Return exec i3-sensible-terminal
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+bindsym $mod+d exec dmenu_run
+# There also is the (new) i3-dmenu-desktop which only displays applications
+# shipping a .desktop file. It is a wrapper around dmenu, so you need that
+# installed.
+# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+
+# change focus
+bindsym $mod+j focus left
+bindsym $mod+k focus down
+bindsym $mod+l focus up
+bindsym $mod+semicolon focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+j move left
+bindsym $mod+Shift+k move down
+bindsym $mod+Shift+l move up
+bindsym $mod+Shift+semicolon move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# switch to workspace
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
+bindsym $mod+0 workspace 10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace 1
+bindsym $mod+Shift+2 move container to workspace 2
+bindsym $mod+Shift+3 move container to workspace 3
+bindsym $mod+Shift+4 move container to workspace 4
+bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+6 move container to workspace 6
+bindsym $mod+Shift+7 move container to workspace 7
+bindsym $mod+Shift+8 move container to workspace 8
+bindsym $mod+Shift+9 move container to workspace 9
+bindsym $mod+Shift+0 move container to workspace 10
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym j resize shrink width 10 px or 10 ppt
+        bindsym k resize grow height 10 px or 10 ppt
+        bindsym l resize shrink height 10 px or 10 ppt
+        bindsym semicolon resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
+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
+}
diff --git a/i3status/config b/i3status/config
new file mode 100644
index 0000000..9e8cf00
--- /dev/null
+++ b/i3status/config
@@ -0,0 +1,68 @@
+general {
+        colors = true
+        interval = 5
+}
+
+order += "wireless wlp3s0"
+order += "ethernet enp0s25"
+order += "path_exists VPN"
+order += "load"
+order += "tztime local"
+order += "tztime berlin"
+order += "battery all"
+
+wireless wlp3s0 {
+        format_up = "%essid"
+        format_down = "wlan"
+}
+
+ethernet enp0s25 {
+        # if you use %speed, i3status requires the cap_net_admin capability
+        format_up = "eth: %ip (%speed)"
+        format_down = "eth"
+}
+
+battery all {
+        format = "%status %percentage %remaining %consumption"
+        format_down = "No battery"
+	last_full_capacity = true
+        status_chr = "⚡ CHR"
+        status_bat = "🔋 BAT"
+        status_unk = "? UNK"
+        status_full = "☻ FULL"
+        path = "/sys/class/power_supply/BAT%d/uevent"
+        low_threshold = 20
+}
+
+run_watch DHCP {
+        pidfile = "/var/run/dhclient*.pid"
+}
+
+run_watch VPNC {
+        # file containing the PID of a vpnc process
+        pidfile = "/var/run/vpnc/pid"
+}
+
+path_exists VPN {
+        # path exists when a VPN tunnel launched by nmcli/nm-applet is active
+        path = "/proc/sys/net/ipv4/conf/tun0"
+}
+
+tztime local {
+        format = "Day: %d Local: %H:%M"
+}
+
+tztime berlin {
+        format = "HH: %H:%M"
+        timezone = "Europe/Berlin"
+}
+
+load {
+        format = "%5min"
+}
+
+disk "/" {
+        format = "%free"
+}
+
+
diff --git a/setup.sh b/setup.sh
index 27723d5..860fd19 100755
--- a/setup.sh
+++ b/setup.sh
@@ -9,7 +9,9 @@ echo
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
 	echo -e "${GREEN} Wiping old backups ${RESET}"
-	rm -rf ~/.vim~
+	rm -rf ~/.config/i3status~
+	rm -rf ~/.config/i3~
+        rm -rf ~/.vim~
 	rm -f ~/.vimrc~
 	rm -f ~/.bashrc~
 	echo -e "${GREEN} Deleted old backups ${RESET}"
@@ -18,6 +20,8 @@ fi
 
 echo -e "${GREEN} Backing Up and moving configs ${RESET}"
 
+mv ~/.config/i3status ~/.config/i3status~
+mv ~/.config/i3 ~/.config/i3~
 mv ~/.bashrc ~/.bashrc~
 mv ~/.vimrc ~/.vimrc~
 mv ~/.vim ~/.vim~
@@ -26,6 +30,8 @@ echo -e "${GREEN} Preparing ${RESET}"
 
 touch ~/.bashrc ~/.vimrc
 mkdir -p ~/.config/wmfs
+mkdir -p ~/.config/i3
+mkdir -p ~/.config/i3status
 mkdir -p ~/.vim
 mkdir -p ~/.vim/backup
 mkdir -p ~/.vim/tmp
@@ -37,6 +43,9 @@ mkdir tmp/
 
 ln -rsf wmfsrc ~/.config/wmfs/wmfsrc
 
+ln -rsf i3/config ~/.config/i3/config
+ln -rsf i3status/config ~/.config/i3status/config
+
 ln -rsf .bashrc ~/.bashrc
 
 mkdir -p ~/.vim
@@ -52,14 +61,14 @@ echo -e "${GREEN} Installing Deps ${RESET}"
 echo -e "vim-airline"
 echo -e "${GREEN} Please run :helptags on first run ${RESET}"
 
-git clone https://github.com/vim-airline/vim-airline ~/.vim/bundle/vim-airline
+git clone https://github.com/vim-airline/vim-airline ~/.vim/bundle/vim-airline &> /dev/null
 
 echo -e "${GREEN} nerdtree ${RESET}"
 
-git clone https://github.com/scrooloose/nerdtree.git ~/.vim/bundle/nerdtree
+git clone https://github.com/scrooloose/nerdtree.git ~/.vim/bundle/nerdtree &> /dev/null
 
 echo -e "${GREEN} mustang colour theme ${RESET}" 
-git clone https://github.com/croaker/mustang-vim tmp/
+git clone https://github.com/croaker/mustang-vim tmp/ &> /dev/null
 cp tmp/colors/mustang.vim ~/.vim/colors/
 
 echo -e "${GREEN} clearning up ${RESET}"