diff --git a/conky/conkyrc b/conky/conkyrc
new file mode 100644
index 0000000..d8ec458
--- /dev/null
+++ b/conky/conkyrc
@@ -0,0 +1,144 @@
+# Conky, a system monitor, based on torsmo
+#
+# Any original torsmo code is licensed under the BSD license
+#
+# All code written since the fork of torsmo is licensed under the GPL
+#
+# Please see COPYING for details
+#
+# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
+# Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+# All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+alignment top_right
+background no
+border_width 0
+cpu_avg_samples 2
+draw_borders no
+draw_graph_borders yes
+use_xft yes
+xftfont DejaVu Sans Mono:size=10
+gap_x 5
+gap_y 60
+minimum_size 5 5
+net_avg_samples 2
+no_buffers yes
+out_to_console no
+out_to_stderr no
+extra_newline no
+own_window yes
+own_window_class Conky
+own_window_type desktop
+stippled_borders 0
+update_interval 1.0
+update_interval_on_battery 1.0
+uppercase no
+use_spacer none
+show_graph_scale no
+show_graph_range no
+
+use_xft yes
+double_buffer yes
+format_human_readable yes
+override_utf8_locale yes
+own_window_class Conky
+own_window_title Conky
+temperature_unit celsius
+
+#own_window_argb_visual yes
+#own_window_argb_value 100
+own_window_transparent yes
+
+uppercase no
+gap_x 10
+gap_y 10
+
+own_window_type override
+
+short_units yes
+
+use_spacer yes
+
+draw_outline no
+stippled_borders no
+
+draw_borders no
+
+maximum_width 300
+minimum_size 300 500
+
+draw_outline yes
+default_outline_color black
+default_color white
+draw_shades no
+default_shade_color white
+
+own_window_hints undecorated
+ 
+pad_percents 2
+use_spacer left
+
+TEXT
+${alignc}${tztime local %A, %Y-%m-%d %H:%M:%S} 
+
+${nodename}${alignr}Uptime: ${uptime}
+${sysname} ${kernel}${alignr}Load: ${loadavg 1}
+${hr}
+${alignc} Battery: ${battery} (${battery_time})
+${battery_bar}
+${hr}
+CPU usage: ${cpu cpu0}% ${cpubar}
+${cpugraph cpu0 40}
+${hr}
+/    : ${fs_used /}/${fs_size /} (${fs_used_perc /}%) ${fs_bar /}
+/home: ${fs_used /home}/${fs_size /home} (${fs_used_perc /home}%) ${fs_bar /home}
+/var : ${fs_used /var}/${fs_size /var} (${fs_used_perc /var}%) ${fs_bar /var}
+/boot: ${fs_used /boot}/${fs_size /boot} (${fs_used_perc /boot}%) ${fs_bar /boot}
+${hr}
+MEM  : ${mem}/${memmax} (${memperc}%) ${membar}
+SWAP : ${swap}/${swapmax} (${swapperc}%) ${swapbar}
+${hr}
+NETWORK: 
+wlp2s0: ${addr wlp2s0}
+DOWN: ${downspeed wlp2s0}${alignr}UP: ${upspeed wlp2s0}
+${downspeedgraph wlp2s0 40,130}${alignr}${upspeedgraph wlp2s0 40,130}
+TOTAL DOWN: ${totaldown wlp2s0}${alignr}UP: ${totalup wlp2s0}
+
+enp1so: ${addr enp1s0}
+
+#TEMP:
+#hdd: ${hddtemp}°C - cpu: ${i2c temp 1}
+
+#${scroll 16 $nodename - $sysname $kernel on $machine | }
+#$hr
+#${color grey}Uptime:$color $uptime
+#${color grey}Frequency (in MHz):$color $freq
+#${color grey}Frequency (in GHz):$color $freq_g
+#${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4}
+#${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4}
+#${color grey}CPU Usage:$color $cpu% ${cpubar 4}
+#${color grey}Processes:$color $processes  ${color grey}Running:$color $running_processes
+#$hr
+#${color grey}File systems:
+# / $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
+#${color grey}Networking:
+#Up:$color ${upspeed eth0} ${color grey} - Down:$color ${downspeed eth0}
+#$hr
+#${color grey}Name              PID   CPU%   MEM%
+#${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
+#${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
+#${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
+#${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}
diff --git a/i3/i3/config b/i3/i3/config
index 5631f9a..7585343 100644
--- a/i3/i3/config
+++ b/i3/i3/config
@@ -205,6 +205,8 @@ for_window [class="^Wicd-client.py$"] floating enable
 # Notifications through xfce4-notifyd, e.g. notifications from wicd
 for_window [class="^Xfce4-notifyd$"] floating enable
 
+for_window [class="^Conky$" ] floating enable
+
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
@@ -242,6 +244,9 @@ exec --no-startup-id xset r rate $mouse_repeat_delay $mouse_repeat_speed
 # Start wicd in tray
 exec --no-startup-id wicd-gtk --tray
 
+# Start conky
+exec --no-startup-id conky 
+
 # Enabling a mode to shutdown, reboot, lock screen and so on
 set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
 mode "$mode_system" {
diff --git a/scripts/makesymlinks.bash b/scripts/makesymlinks.bash
index 2f49000..cae2541 100755
--- a/scripts/makesymlinks.bash
+++ b/scripts/makesymlinks.bash
@@ -7,7 +7,7 @@ config_dir="$HOME/dotfiles/"
 backup_dir="$HOME/dotfiles.bak/"
 
 # the following folders inside $config_dir will be inspected and symlinked:
-symlink_folders="bash git i3 vim zsh"
+symlink_folders="bash git i3 vim zsh conky"
 
 path_combine()
 {