diff --git a/rc.lua b/rc.lua
index dce9509..87ed4c4 100644
--- a/rc.lua
+++ b/rc.lua
@@ -1,3 +1,4 @@
+-- {{{ Includes
 -- Standard awesome library
 local gears = require('gears')
 local awful = require('awful')
@@ -10,7 +11,8 @@ local beautiful = require('beautiful')
 -- Notification library
 local naughty = require('naughty')
 local menubar = require('menubar')
-
+-- }}}
+-- {{{ Custom functions
 -- enable testing if file exists
 function exists(name)
 	local f=io.open(name,'r')
@@ -31,7 +33,7 @@ function enters(element, table)
 	end
 	return false
 end
-
+-- }}}
 -- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)
@@ -65,7 +67,6 @@ do
 	)
 end
 -- }}}
-
 -- {{{ Variable definitions
 -- Themes define colours, icons, and wallpapers
 beautiful.init('/home/von/vdotfiles/theme.lua')
@@ -121,7 +122,6 @@ local layouts = {
 	}
 }
 -- }}}
-
 -- {{{ Wallpaper
 if beautiful.wallpaper then
 	for s = 1, screen.count() do
@@ -129,7 +129,6 @@ if beautiful.wallpaper then
 	end
 end
 -- }}}
-
 -- {{{ Tags
 -- Provide tag names and layout settings if we wish to define them
 tags = {}
@@ -165,7 +164,6 @@ for s = 1, screen.count() do
 	tags[s] = awful.tag(tags[s].name, s, tags[s].layout)
 end
 -- }}}
-
 -- {{{ Menu
 -- Create a laucher widget and a main menu
 mymainmenu_restart = {
@@ -185,7 +183,6 @@ mymainmenu = awful.menu({
 -- Menubar configuration
 menubar.utils.terminal = terminal -- Set the terminal for applications that require it
 -- }}}
-
 -- {{{ Menu for layoutbox
 mylbmenu = awful.menu({
 	items = {
@@ -195,7 +192,6 @@ mylbmenu = awful.menu({
 	}
 })
 -- }}}
-
 -- {{{ Wibox
 -- Create a textclock widget
 mytextclock = awful.widget.textclock('%a %d %H:%M')
@@ -218,9 +214,7 @@ mytaglist.buttons = awful.util.table.join(
 	awful.button({        }, 1, awful.tag.viewonly),
 	awful.button({ modkey }, 1, awful.client.movetotag),
 	awful.button({        }, 3, awful.tag.viewtoggle),
-	awful.button({ modkey }, 3, awful.client.toggletag),
-	awful.button({        }, 5, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end),
-	awful.button({        }, 4, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
+	awful.button({ modkey }, 3, awful.client.toggletag)
 )
 mytasklist = {}
 mytasklist.buttons = awful.util.table.join(
@@ -323,7 +317,6 @@ for s = 1, screen.count() do
 	mywibox[s]:set_widget(layout)
 end
 -- }}}
-
 -- {{{ Mouse bindings
 root.buttons(
 	awful.util.table.join(
@@ -331,7 +324,6 @@ root.buttons(
 	)
 )
 -- }}}
-
 -- {{{ Key bindings
 globalkeys = awful.util.table.join(
 	awful.key({ modkey,           }, 'Up',     function () awful.screen.focus_relative( 1) end),
@@ -504,7 +496,6 @@ clientbuttons = awful.util.table.join(
 -- Set keys
 root.keys(globalkeys)
 -- }}}
-
 -- {{{ Rules
 awful.rules.rules = {
 	-- All clients will match this rule.
@@ -622,7 +613,6 @@ awful.rules.rules = {
 	}
 }
 -- }}}
-
 -- {{{ Signals
 -- Signal function to execute when a new client appears.
 client.connect_signal(
diff --git a/shellrc b/shellrc
index 131c6a4..f1cca16 100644
--- a/shellrc
+++ b/shellrc
@@ -2,7 +2,8 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-# Simplify further configuration by is_zsh() function instead of using [[]] every time
+# {{{ Environment setting and a few options
+# Some functions for DRY
 is_zsh() { [[ -n ${ZSH_VERSION} ]]; }
 if is_zsh; then
 	is_exec() { [[ -x $(whence ${1}) ]]; }
@@ -11,26 +12,26 @@ else
 	is_exec() { [[ -x $(type -P ${1}) ]]; }
 fi
 
-# ---> $PATH
+# $PATH
 local_bin="${HOME}/.local/bin"
 [[ -r ${local_bin} && ${PATH} != *${local_bin}* ]] && PATH=${PATH}:${local_bin}
 unset local_bin
 
-# ---> completion
+# completion
 comp_enabled=true
 
-# ---> dotfiles dir
+# dotfiles dir
 dotfiles="${HOME}/vdotfiles"
 
-# ---> environment
+# environment
 export TIME_STYLE='long-iso'
 export LC_ALL='en_US.UTF-8'
 export LANG=${LC_ALL}
 export PAGER='less -R'
 export EDITOR='vim'
 export LS_COLORS='no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.sh=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.dot=31:*.dotx=31:*.xls=31:*.xlsx=31:*.ppt=31:*.pptx=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:'
-
-# ---> prompt
+# }}}
+# {{{ Prompt
 if is_zsh; then
 	PROMPT="%B%(!..%(1000#..%F{red}%n%f@))%F{blue}%m%f %F{white}%~%f %(1j.+%F{red}%j%f.)%(!.%F{red}.%F{green})%#%f%b "
 else
@@ -56,8 +57,8 @@ else
 	PS1="${user_ps}\[\e[1;34m\]\h\[\e[0m\] \[\e[1;33m\]\v\[\e[0m\] \[\e[37m\]\w\[\e[0m\] ${bang_ps} "
 	unset user_ps bang_ps
 fi
-
-# ---> key bindings
+# }}}
+# {{{ Key bindings
 if is_zsh; then
 	bindkey -e
 	# urxvt
@@ -88,8 +89,8 @@ else
 	bind '"[5~"':backward-word
 	bind '"[6~"':forward-word
 fi
-
-# ---> aliases
+# }}}
+# {{{ Aliases
 alias vi='command vim'
 alias less='command less -R'
 alias cower='command cower -c'
@@ -187,8 +188,8 @@ if is_zsh; then
 		alias -s exe=wine
 	fi
 fi
-
-# ---> functions
+# }}}
+# {{{ Functions
 screenoffdisable() {
 	xset -dpms
 	xset s off
@@ -203,8 +204,8 @@ dotfiles_update() {
 }
 # enable autoload feature for zsh
 is_zsh && autoload screenoffdisable screenoffenable dotfiles_update
-
-# ---> other shell specific settings and sourcing of external files
+# }}}
+# {{{ Other shell specific settings and sourcing of external files
 if is_zsh; then
 	SAVEHIST=1000
 	HISTFILE="${HOME}/.histfile"
@@ -274,3 +275,4 @@ else
 	# we want to see exit code on error (it also has to be the last entry here)
 	trap 'echo -e "\e[0mbash: exit \e[1;37m$?\e[0m"' ERR
 fi
+# }}}
diff --git a/vimrc b/vimrc
index e89f562..3481470 100644
--- a/vimrc
+++ b/vimrc
@@ -24,6 +24,7 @@ set ignorecase
 set smartcase
 set clipboard=exclude:.*
 set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [POS=%04l,%04v][%p%%]\ [LEN=%L]
+set foldmethod=marker
 
 set list
 set listchars=tab:\|\ ,trail:*,nbsp:x
diff --git a/xresources b/xresources
index 708e3e8..dd76eb0 100644
--- a/xresources
+++ b/xresources
@@ -1,14 +1,14 @@
-! Xresources file
+! {{{ xft and cursor configuration
 Xcursor.theme:		Vanilla-DMZ-AA
 Xft.antialias:		true
 Xft.rgba:		rgb
 Xft.hinting:		true
 Xft.hintstyle:		hintslight
 Xft.dpi:		96
-
+! }}}
+! {{{ urxvt
 #define urxvt_font xft:Terminus:bold:size=11:antialias=false
 
-! urxvt
 URxvt.scrollBar:	false
 URxvt.font:		urxvt_font
 URxvt.boldFont:		urxvt_font
@@ -31,8 +31,8 @@ URxvt.url-launcher:	/usr/bin/firefox
 URxvt.matcher.button:	3
 URxvt.keysym.C-C:	perl:clipboard:copy
 URxvt.keysym.C-V:	perl:clipboard:paste
-
-!! drop in Solarized colorscheme for Xresources/Xdefaults
+! }}}
+! {{{ drop in Solarized colorscheme for Xresources/Xdefaults
 
 !!SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB
 !!--------- ------- ---- -------  ----------- ---------- ----------- -----------
@@ -124,3 +124,4 @@ URxvt.keysym.C-V:	perl:clipboard:paste
 !! white dark/light
 *color7:		S_base2
 *color15:		S_base3
+! }}}