21 files changed, 602 insertions, 67 deletions

diff --git a/.config/compton.conf b/.config/compton.conf
index 893aa32..e49a70a 100644
--- a/.config/compton.conf
+++ b/.config/compton.conf
@@ -11,7 +11,10 @@ shadow-offset-y = -7;   # The top offset for shadows. (default -15)
 # shadow-red = 0.0;   # Red color value of shadow. (0.0 - 1.0, defaults to 0)
 # shadow-green = 0.0;   # Green color value of shadow. (0.0 - 1.0, defaults to 0)
 # shadow-blue = 0.0;    # Blue color value of shadow. (0.0 - 1.0, defaults to 0)
-shadow-exclude = [ "n:e:Notification", "_GTK_FRAME_EXTENTS@:c" ];  # Exclude conditions for shadows.
+shadow-exclude = [
+  "n:e:Notification",
+  "_GTK_FRAME_EXTENTS@:c",
+];  # Exclude conditions for shadows.
 
 # shadow-exclude = "n:e:Notification";
 shadow-ignore-shaped = true;  # Avoid drawing shadow on all shaped windows
@@ -35,8 +38,14 @@ alpha-step = 0.06;      # XRender backend: Step size for alpha pictures. Increas
 # blur-background-frame = true;   # Blur background of opaque windows with transparent
           # frames as well.
 blur-background-fixed = false;    # Do not let blur radius adjust based on window opacity.
-blur-background-exclude = [ "window_type = 'dock'", "window_type = 'desktop'" ];
-          # Exclude conditions for background blur.
+blur-background-exclude = [
+  "window_type = 'dock'",
+  "window_type = 'desktop'",
+  "name *= 'VLC'",
+  "name *= 'Firefox'",
+  "name *= 'Vimperator'"
+];
+# Exclude conditions for background blur.
 
 # Fading
 fading = true;      # Fade windows during opacity changes.
@@ -44,7 +53,11 @@ fading = true;      # Fade windows during opacity changes.
 fade-in-step = 0.03;    # Opacity change between steps while fading in. (default 0.028).
 fade-out-step = 0.03;   # Opacity change between steps while fading out. (default 0.03).
 # no-fading-openclose = true; # Avoid fade windows in/out when opening/closing.
-fade-exclude = [ ];   # Exclude conditions for fading.
+fade-exclude = [
+  "name *= 'VLC'",
+  "name *= 'Firefox'",
+  "name *= 'Vimperator'"
+];   # Exclude conditions for fading.
 
 # Other
 backend = "glx"   # Backend to use: "xrender" or "glx". GLX backend is typically
@@ -67,7 +80,11 @@ sw-opti = false;    # Limit compton to repaint at most once every 1 / refresh_ra
         # Incompatible with certain VSync methods.
 unredir-if-possible = false;  # Unredirect all windows if a full-screen opaque window is
         # detected, to maximize performance for full-screen windows.
-focus-exclude = [ ];    # A list of conditions of windows that should always be considered
+focus-exclude = [
+  "name *= 'VLC'",
+  "name *= 'Firefox'",
+  "name *= 'Vimperator'"
+];    # A list of conditions of windows that should always be considered
         # focused.
 detect-transient = true;  # Use WM_TRANSIENT_FOR to group windows, and consider windows in
         # the same group focused at the same time.
diff --git a/.config/dpms b/.config/dpms
index 0e7a18d..0a4c29b 100644
--- a/.config/dpms
+++ b/.config/dpms
@@ -4,10 +4,7 @@
 # Arrays must be of the form array=( program otherprogram )
 
 # Pre-compiled programs
-programs=( supercollider sclang scsynth ardour-3.5.378 pdextended vlc )
-
-# Programs run by python2
-python2=( keepnote )
+programs=( supercollider sclang scsynth ardour-3.5.403 pdextended vlc keepnote )
 
 # tmp locations for dpms and screensaver settings
 adjust_dpms=/tmp/adjust_dpms
diff --git a/.config/khard/khard.conf b/.config/khard/khard.conf
new file mode 100644
index 0000000..b5d5cbc
--- /dev/null
+++ b/.config/khard/khard.conf
@@ -0,0 +1,32 @@
+[addressbooks]
+[[akt]]
+path = ~/.contacts/akt/
+
+[[bands]]
+path = ~/.contacts/bands/
+
+[[funkhaus]]
+path = ~/.contacts/funkhaus/
+
+[[personal]]
+path = ~/.contacts/personal/
+
+[[pool]]
+path = ~/.contacts/pool/
+
+[[restaurants]]
+path = ~/.contacts/restaurants/
+
+[[service]]
+path = ~/.contacts/service/
+
+[[tu-berlin]]
+path = ~/.contacts/tu-berlin/
+
+[[venues]]
+path = ~/.contacts/venues/
+
+[general]
+editor = /usr/bin/vim
+default_country = Germany
+default_action = list
diff --git a/.config/linuxsampler.org/Qsampler.conf b/.config/linuxsampler.org/Qsampler.conf
new file mode 100644
index 0000000..bb420d0
--- /dev/null
+++ b/.config/linuxsampler.org/Qsampler.conf
@@ -0,0 +1,63 @@
+[Geometry]
+qsamplerInstrumentListForm\x=1
+qsamplerInstrumentListForm\y=25
+qsamplerInstrumentListForm\width=720
+qsamplerInstrumentListForm\height=340
+qsamplerInstrumentListForm\visible=true
+qsamplerDeviceForm\x=0
+qsamplerDeviceForm\y=0
+qsamplerDeviceForm\width=530
+qsamplerDeviceForm\height=488
+qsamplerDeviceForm\visible=false
+qsamplerMainForm\x=961
+qsamplerMainForm\y=25
+qsamplerMainForm\width=958
+qsamplerMainForm\height=1174
+qsamplerMainForm\visible=true
+
+[Layout]
+DockWindows=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\x3\0\0\x3\xbe\0\0\0\xd4\xfc\x1\0\0\0\x1\xfb\0\0\0 \0q\0s\0\x61\0m\0p\0l\0\x65\0r\0M\0\x65\0s\0s\0\x61\0g\0\x65\0s\x1\0\0\0\0\0\0\x3\xbe\0\0\0\x46\0\xff\xff\xff\0\0\x3\xbe\0\0\x3t\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\x16\0\x66\0i\0l\0\x65\0T\0o\0o\0l\0\x62\0\x61\0r\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0\x65\0\x64\0i\0t\0T\0o\0o\0l\0\x62\0\x61\0r\x1\0\0\0\xf3\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x1e\0\x63\0h\0\x61\0n\0n\0\x65\0l\0s\0T\0o\0o\0l\0\x62\0\x61\0r\x1\0\0\x1\xc7\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
+
+[Program]
+Version=0.2.3
+
+[Options]
+Server\ServerHost=localhost
+Server\ServerPort=8888
+Server\ServerTimeout=1000
+Server\ServerStart=true
+Server\ServerCmdLine=linuxsampler
+Server\StartDelay=3
+Logging\MessagesLog=false
+Logging\MessagesLogPath=qsampler.log
+Display\DisplayFont=",9,-1,5,50,0,0,0,0,0"
+Display\DisplayEffect=true
+Display\AutoRefresh=true
+Display\AutoRefreshTime=1000
+Display\MaxVolume=100
+Display\MessagesFont="Sans Serif,9,-1,5,50,0,0,0,0,0"
+Display\MessagesLimit=true
+Display\MessagesLimitLines=1000
+Display\ConfirmRemove=true
+Display\KeepOnTop=true
+Display\StdoutCapture=true
+Display\CompletePath=true
+Display\MaxRecentFiles=5
+Display\BaseFontSize=0
+Display\InstrumentNames=true
+View\Menubar=true
+View\Toolbar=true
+View\Statusbar=true
+View\AutoArrange=true
+
+[Default]
+SessionDir=
+InstrumentDir=
+EngineName=
+AudioDriver=
+MidiDriver=
+MidiMap=1
+MidiBank=0
+MidiProg=0
+Volume=100
+Loadmode=0
diff --git a/.config/mc/ini b/.config/mc/ini
new file mode 100644
index 0000000..d24391f
--- /dev/null
+++ b/.config/mc/ini
@@ -0,0 +1,139 @@
+[Midnight-Commander]
+verbose=1
+pause_after_run=1
+shell_patterns=1
+auto_save_setup=1
+preallocate_space=0
+auto_menu=0
+use_internal_view=1
+use_internal_edit=1
+clear_before_exec=1
+confirm_delete=1
+confirm_overwrite=1
+confirm_execute=0
+confirm_history_cleanup=1
+confirm_exit=0
+confirm_directory_hotlist_delete=1
+safe_delete=0
+mouse_repeat_rate=100
+double_click_speed=250
+use_8th_bit_as_meta=0
+confirm_view_dir=0
+mouse_move_pages_viewer=1
+mouse_close_dialog=0
+fast_refresh=0
+drop_menus=0
+wrap_mode=1
+old_esc_mode=0
+old_esc_mode_timeout=1000000
+cd_symlinks=1
+show_all_if_ambiguous=0
+max_dirt_limit=10
+use_file_to_guess_type=1
+alternate_plus_minus=0
+only_leading_plus_minus=1
+show_output_starts_shell=0
+xtree_mode=0
+num_history_items_recorded=60
+file_op_compute_totals=1
+classic_progressbar=1
+vfs_timeout=60
+ftpfs_directory_timeout=900
+use_netrc=1
+ftpfs_retry_seconds=30
+ftpfs_always_use_proxy=0
+ftpfs_use_passive_connections=1
+ftpfs_use_passive_connections_over_proxy=0
+ftpfs_use_unix_list_options=1
+ftpfs_first_cd_then_ls=1
+fish_directory_timeout=900
+editor_tab_spacing=8
+editor_word_wrap_line_length=72
+editor_fill_tabs_with_spaces=0
+editor_return_does_auto_indent=1
+editor_backspace_through_tabs=0
+editor_fake_half_tabs=1
+editor_option_save_mode=0
+editor_option_save_position=1
+editor_option_auto_para_formatting=0
+editor_option_typewriter_wrap=0
+editor_edit_confirm_save=1
+editor_syntax_highlighting=1
+editor_persistent_selections=1
+editor_drop_selection_on_copy=1
+editor_cursor_beyond_eol=0
+editor_cursor_after_inserted_block=0
+editor_visible_tabs=1
+editor_visible_spaces=1
+editor_line_state=0
+editor_simple_statusbar=0
+editor_check_new_line=0
+editor_show_right_margin=0
+editor_group_undo=0
+editor_ask_filename_before_edit=0
+nice_rotating_dash=1
+mcview_remember_file_position=0
+auto_fill_mkdir_name=1
+copymove_persistent_attr=1
+editor_backup_extension=~
+editor_filesize_threshold=64M
+editor_stop_format_chars=-+*\\,.;:&>
+mcview_eof=
+ignore_ftp_chattr_errors=true
+skin=default
+
+[Layout]
+message_visible=1
+keybar_visible=1
+xterm_title=1
+output_lines=0
+command_prompt=1
+menubar_visible=1
+free_space=1
+horizontal_split=0
+vertical_equal=1
+left_panel_size=136
+horizontal_equal=1
+top_panel_size=1
+
+[Misc]
+timeformat_recent=%b %e %H:%M
+timeformat_old=%b %e  %Y
+ftp_proxy_host=gate
+ftpfs_password=anonymous@
+display_codepage=UTF-8
+source_codepage=Other_8_bit
+autodetect_codeset=
+clipboard_store=
+clipboard_paste=
+
+[Colors]
+base_color=
+xterm-termite=
+color_terminals=
+
+[Panels]
+show_mini_info=true
+kilobyte_si=false
+mix_all_files=false
+show_backups=true
+show_dot_files=true
+fast_reload=false
+fast_reload_msg_shown=false
+mark_moves_down=true
+reverse_files_only=true
+auto_save_setup_panels=false
+navigate_with_arrows=false
+panel_scroll_pages=true
+mouse_move_pages=true
+filetype_mode=true
+permission_mode=false
+torben_fj_mode=false
+quick_search_mode=2
+select_flags=6
+
+[Panelize]
+Find *.orig after patching=find . -name \\*.orig -print
+Find SUID and SGID programs=find . \\( \\( -perm -04000 -a -perm /011 \\) -o \\( -perm -02000 -a -perm /01 \\) \\) -print
+Find rejects after patching=find . -name \\*.rej -print
+Modified git files=git ls-files --modified
diff --git a/.config/mc/panels.ini b/.config/mc/panels.ini
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/mc/panels.ini
diff --git a/.config/patchagerc b/.config/patchagerc
new file mode 100644
index 0000000..ff1a691
--- /dev/null
+++ b/.config/patchagerc
@@ -0,0 +1,19 @@
+window_location 0 0
+window_size 958 1174
+zoom_level 0.960316
+font_size 11
+show_toolbar 1
+sprung_layout 1
+module_position "Midi Through" input 587 147
+module_position "Midi Through" output 102 147
+module_position "a2j" input 490 6322
+module_position "a2j" output 8 4787
+module_position "ardour" inputoutput 519 2431.5
+module_position "firewire_pcm" input 353.351 259.03
+module_position "firewire_pcm" output 45 2551.5
+module_position "gx_head_amp" inputoutput 726.598 297.735
+module_position "gx_head_fx" inputoutput 836.681 368.929
+module_position "nanoKONTROL2" input 579 77
+module_position "nanoKONTROL2" output 94 77
+module_position "nanoPAD2" input 595 8
+module_position "nanoPAD2" output 110 8
diff --git a/.config/redshift.conf b/.config/redshift.conf
index 0cb8593..f47dc59 100644
--- a/.config/redshift.conf
+++ b/.config/redshift.conf
@@ -4,10 +4,10 @@ temp-day=8700
 temp-night=4700
 brightness-day=1.0
 brightness-night=0.8
-transition=1
+transition=0
 gamma=0.8:0.7:0.8
 location-provider=manual
-adjustment-method=vidmode
+adjustment-method=randr
 
 ; The location provider and adjustment method settings
 ; are in their own sections.
@@ -19,6 +19,6 @@ lon=13.23
 ; In this example screen 1 is adjusted by vidmode. Note
 ; that the numbering starts from 0, so this is actually
 ; the second screen.
-[vidmode]
+[randr]
 screen=0
-screen=1
+;screen=1
diff --git a/.config/termite/config b/.config/termite/config
index 9673da6..fec0056 100644
--- a/.config/termite/config
+++ b/.config/termite/config
@@ -1,47 +1,41 @@
 [options]
-resize_grip = false
 scroll_on_output = false
 scroll_on_keystroke = true
 audible_bell = false
-visible_bell = false
 mouse_autohide = false
 allow_bold = true
 dynamic_title = true
 urgent_on_bell = true
 clickable_url = true
 font = Monospace 9
-scrollback_lines = 6000
+scrollback_lines = 10000
 search_wrap = true
-#icon_name = terminal
+icon_name = terminal
 #geometry = 640x480
 
-# 0.0: opaque, 1.0: transparent
-transparency = 0.11
-pseudo_transparency = false
-
 # "system", "on" or "off"
 cursor_blink = system
 
 # "block", "underline" or "ibeam"
-cursor_shape = block
+cursor_shape = ibeam
 
 # $BROWSER is used by default
 #browser = firefox
 
-# word characters used for word selection
-# (default if unset: all graphic non-punctuation/space characters)
-#word_chars = -A-Za-z0-9,./?%&#:_=+@~
-
 # set size hints for the window
 #size_hints = false
 
+# emit escape sequences for other keys modified by Control
+#modify_other_keys = false
+
 [colors]
+#cursor = #dcdccc
 foreground = #dcdccc
 foreground_bold = #ffffff
-#foreground_dim = #888888
-background = #3f3f3f
-background = #111010
-#cursor = #dcdccc
+background = #000000
+
+# 20% background transparency (requires a compositor)
+background = rgba(00, 00, 00, 0.9)
 
 # if unset, will reverse foreground and background
 highlight = #2f2f2f
@@ -68,9 +62,11 @@ color15 = #ffffff
 #font = Monospace 12
 #foreground = #dcdccc
 #background = #3f3f3f
+#active_foreground = #e68080
+#active_background = #3f3f3f
 #padding = 2
 #border = #3f3f3f
 #border_width = 0.5
 #roundness = 2.0
 
-# vim: ft=dosini
+# vim: ft=dosini cms=#%s
diff --git a/.gitignore b/.gitignore
index 6b7a2bc..0829730 100644
--- a/.gitignore
+++ b/.gitignore
@@ -185,6 +185,7 @@ svn/
 .fontconfig/
 .fonts/
 .forward
+.fst/
 .gconf/
 .gem/
 .gemrc
@@ -213,12 +214,14 @@ svn/
 .jackdrc
 .java/
 .jdownloader/
+.jsampler/
 .kde4/
 .keychain/
 .khal/
 .kicad
 .lesshst
 .lfm_history
+.linphone-history*
 .lives
 .lives-dir/
 .log
@@ -241,6 +244,7 @@ svn/
 .local/share/gvfs-metadata/
 .local/share/icc/
 .local/share/icons/
+.local/share/mc/
 .local/share/mime/
 .local/share/recently-used.xbel
 .local/share/shotwell
@@ -272,6 +276,7 @@ svn/
 .neocon/
 .nicotine/
 .nvidia-settings-rc
+.nviminfo
 .octave_hist
 .openra
 .p7zip
@@ -333,7 +338,6 @@ svn/
 .vim/vim-addons/
 .vim/.*
 .vim/yankring*
-.viminfo
 .vimperator/
 .vimpressrc
 .viminfo
diff --git a/.linphonerc b/.linphonerc
new file mode 100644
index 0000000..4d4c42e
--- /dev/null
+++ b/.linphonerc
@@ -0,0 +1,146 @@
+[sip]
+media_encryption=none
+default_proxy=-1
+multi_transport_migration_done=1
+guess_hostname=1
+contact="" <sip:dave@46.246.38.243:5060>
+inc_timeout=30
+in_call_timeout=0
+delayed_timeout=4
+use_ipv6=0
+register_only_when_network_is_up=1
+register_only_when_upnp_is_ok=1
+
+[misc]
+uuid=63830b54-7f5b-4f3a-a271-c1b84bdd2a0d
+
+[video]
+capture=1
+display=1
+automatically_initiate=1
+automatically_accept=1
+show_local=0
+self_view=0
+device=V4L2: /dev/video0
+size=cif
+
+[net]
+download_bw=0
+upload_bw=0
+adaptive_rate_control=1
+mtu=1300
+
+[GtkUi]
+videoselfview=0
+advanced_ui=1
+
+[sound]
+playback_dev_id=ALSA: default device
+ringer_dev_id=ALSA: default device
+capture_dev_id=ALSA: default device
+echocancellation=1
+remote_ring=/usr/share/sounds/linphone/ringback.wav
+playback_gain_db=0.000000
+mic_gain_db=0.000000
+
+[rtp]
+audio_rtp_port=7078
+video_rtp_port=9078
+audio_jitt_comp=60
+video_jitt_comp=60
+nortp_timeout=30
+audio_adaptive_jitt_comp_enabled=1
+video_adaptive_jitt_comp_enabled=1
+
+[audio_codec_0]
+mime=opus
+rate=48000
+channels=1
+enabled=1
+
+[audio_codec_1]
+mime=speex
+rate=16000
+channels=1
+enabled=1
+
+[audio_codec_2]
+mime=speex
+rate=8000
+channels=1
+enabled=1
+
+[audio_codec_3]
+mime=PCMU
+rate=8000
+channels=1
+enabled=1
+
+[audio_codec_4]
+mime=PCMA
+rate=8000
+channels=1
+enabled=1
+
+[audio_codec_5]
+mime=speex
+rate=32000
+channels=1
+enabled=0
+
+[audio_codec_6]
+mime=L16
+rate=44100
+channels=1
+enabled=0
+
+[audio_codec_7]
+mime=L16
+rate=44100
+channels=2
+enabled=0
+
+[audio_codec_8]
+mime=G722
+rate=8000
+channels=1
+enabled=0
+
+[audio_codec_9]
+mime=GSM
+rate=8000
+channels=1
+enabled=0
+
+[video_codec_0]
+mime=VP8
+rate=90000
+enabled=1
+
+[video_codec_1]
+mime=MP4V-ES
+rate=90000
+enabled=1
+recv_fmtp=profile-level-id=3
+
+[video_codec_2]
+mime=H263-1998
+rate=90000
+enabled=0
+recv_fmtp=CIF=1;QCIF=1
+
+[video_codec_3]
+mime=theora
+rate=90000
+enabled=0
+
+[video_codec_4]
+mime=x-snow
+rate=90000
+enabled=0
+
+[video_codec_5]
+mime=H263
+rate=90000
+enabled=0
+
diff --git a/.nvimrc b/.nvimrc
new file mode 120000
index 0000000..1490f7a
--- /dev/null
+++ b/.nvimrc
@@ -0,0 +1 @@
+.vimrc
\ No newline at end of file
diff --git a/.zpreztorc b/.zpreztorc
index e17c751..d3326d7 100644
--- a/.zpreztorc
+++ b/.zpreztorc
@@ -110,12 +110,12 @@ zstyle ':prezto:module:prompt' theme 'steeef'
 
 # Set syntax highlighters.
 # By default main, brackets, and cursor are enabled.
-# zstyle ':prezto:module:syntax-highlighting' highlighters \
-#   'main' \
-#   'brackets' \
-#   'pattern' \
-#   'cursor' \
-#   'root'
+zstyle ':prezto:module:syntax-highlighting' highlighters \
+   'main' \
+   'brackets' \
+   'pattern' \
+   'cursor' \
+   'root'
 
 #
 # Terminal
diff --git a/.zsh.after/aliases.zsh b/.zsh.after/aliases.zsh
index 6b36ac5..d9e360f 100644
--- a/.zsh.after/aliases.zsh
+++ b/.zsh.after/aliases.zsh
@@ -49,12 +49,6 @@ alias treeg='tree -d /cgroup/systemd/'
 alias sdptree='tree -aC /usr/lib/systemd/'
 alias sdstree='tree -aC /etc/systemd/'
 alias sdutree='tree -aC $HOME/.config/systemd/'
-#systemctl
-alias sdl='sudo systemctl --all'
-alias sdlerr='sudo systemctl --all --full |grep error'
-alias sdlfail='sudo systemctl --all --full |grep failed'
-#timers
-alias sdt='sudo systemctl list-timers'
 #journalctl
 alias sdj='sudo journalctl'
 alias sdjf='sudo journalctl -f'  #Follow the messages
@@ -84,6 +78,9 @@ alias sdsbefore='sudo systemctl show -p "Before"'
 alias sdsafter='sudo systemctl show -p "After"'
 alias sdst='sudo systemctl list-timers'
 alias sdsreload='sudo systemctl daemon-reload'
+alias sds='sudo systemctl --all'
+alias sdserr='sudo systemctl --all --full |grep error'
+alias sdsfail='sudo systemctl --all --full |grep failed'
 #systemd user services
 alias sdustart='systemctl --user start'
 alias sdustop='systemctl --user stop'
@@ -105,6 +102,9 @@ alias sdubefore='systemctl --user show -p "Before"'
 alias sduafter='systemctl --user show -p "After"'
 alias sdut='systemctl --user list-timers'
 alias sdureload='systemctl --user daemon-reload'
+#alias sdu='systemctl --user'
+alias sduerr='systemctl --user --all --full |grep error'
+alias sdufail='systemctl --user --all --full |grep failed'
 #poweroff/reboot/isolate
 alias sdiso='sudo systemctl isolate '
 alias sdreboot='sudo systemctl reboot'
diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh
index e578ef7..ab087ae 100644
--- a/.zsh.after/export.zsh
+++ b/.zsh.after/export.zsh
@@ -16,7 +16,7 @@ case "$(hostname)" in
 esac
 
 export BROWSER=firefox
-export REPORTTIME=30
+export REPORTTIME=5
 
 # if vimpager is installed, use it instead of less
 if [[ -x /usr/bin/vimpager ]];then
diff --git a/.zsh.after/functions.zsh b/.zsh.after/functions.zsh
index 44ce51d..14d133d 100644
--- a/.zsh.after/functions.zsh
+++ b/.zsh.after/functions.zsh
@@ -305,12 +305,39 @@ lclose() {
 ## RSYNC
 
 backupinfo() {
-  rsync -r -n -t -p -o -g -v --progress --delete --ignore-existing --size-only -s --exclude 'lost+found' --exclude '.Trash-1000' --exclude '$RECYCLEBIN' --exclude 'System Volume Information' --exclude '.thumbs' $1 $2
-  echo "rsync -r -n -t -p -o -g -v --progress --delete --ignore-existing --size-only -s --exclude 'lost+found' --exclude '.Trash-1000' --exclude '\$RECYCLEBIN' --exclude 'System Volume Information' --exclude '.thumbs' /path/to/folder/ /path/to/other/folder"
+  log_cyan "INFO"
+  rsync\
+    -r\
+    -n\
+    -t\
+    -p\
+    -o\
+    -g\
+    -v\
+    --progress\
+    --delete\
+    --ignore-existing\
+    --size-only\
+    -s\
+    --exclude 'lost+found'\
+    --exclude '.Trash-1000'\
+    --exclude '$RECYCLEBIN'\
+    --exclude 'System Volume Information'\
+    --exclude '.thumbs'\
+    $1 $2
+  echo "backupfolder path/to/folder/ /path/to/other/folder"
 }
 
 backupfolder() {
-  rsync -r -t -p -o -g -v --progress --delete --ignore-existing --size-only -s --exclude 'lost+found' --exclude '.Trash-1000' --exclude '$RECYCLEBIN' --exclude 'System Volume Information' --exclude '.thumbs' $1 $2
+  rsync \
+    -r\
+    -t\
+    -p\
+    -o\
+    -g\
+    -v\
+    --progress\
+    --delete --ignore-existing --size-only -s --exclude 'lost+found' --exclude '.Trash-1000' --exclude '$RECYCLEBIN' --exclude 'System Volume Information' --exclude '.thumbs' $1 $2
 }
 
 
diff --git a/.zsh.after/prompt.zsh b/.zsh.after/prompt.zsh
index 0cb4ad6..46c9f36 100644
--- a/.zsh.after/prompt.zsh
+++ b/.zsh.after/prompt.zsh
@@ -1,2 +1,2 @@
-prompt steeef_simplified
+prompt dvzrv
 
diff --git a/.zsh.prompts/prompt_dvzrv_setup b/.zsh.prompts/prompt_dvzrv_setup
new file mode 100644
index 0000000..3046892
--- /dev/null
+++ b/.zsh.prompts/prompt_dvzrv_setup
@@ -0,0 +1,105 @@
+#
+# A theme based on Steve Losh's Extravagant Prompt with vcs_info integration.
+#
+# Authors:
+#   Steve Losh <steve@stevelosh.com>
+#   Bart Trojanowski <bart@jukie.net>
+#   Brian Carper <brian@carper.ca>
+#   steeef_simplified <steeef_simplified@gmail.com>
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+# Screenshots:
+#   http://i.imgur.com/HyRvv.png
+#
+
+function prompt_steeef_simplified_precmd {
+  # Check for untracked files or updated submodules since vcs_info does not.
+  if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+    branch_format="(${_prompt_steeef_simplified_colors[1]}%b%f%u%c${_prompt_steeef_simplified_colors[4]}●%f)"
+  else
+    branch_format="(${_prompt_steeef_simplified_colors[1]}%b%f%u%c)"
+  fi
+
+  zstyle ':vcs_info:*:prompt:*' formats "${branch_format}"
+
+  vcs_info 'prompt'
+
+  if (( $+functions[python-info] )); then
+    python-info
+  fi
+
+  # Get ruby information
+#  if (( $+functions[ruby-info] )); then
+#    ruby-info
+#  fi
+}
+
+# Check if this shell is run through ssh
+function ssh_connection {
+  if [[ -n $SSH_CONNECTION ]]; then
+    echo "[%F{red}ssh%f] "
+  fi
+}
+
+function prompt_steeef_simplified_setup {
+  setopt LOCAL_OPTIONS
+  unsetopt XTRACE KSH_ARRAYS
+  prompt_opts=(cr percent subst)
+
+  # Load required functions.
+  autoload -Uz add-zsh-hook
+  autoload -Uz vcs_info
+
+  # Add hook for calling vcs_info before each command.
+  add-zsh-hook precmd prompt_steeef_simplified_precmd
+
+  # Use extended color pallete if available.
+  if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
+    _prompt_steeef_simplified_colors=(
+      "%F{81}"  # Turquoise
+      "%F{166}" # Orange
+      "%F{135}" # Purple
+      "%F{161}" # Hotpink
+      "%F{118}" # Limegreen
+    )
+  else
+    _prompt_steeef_simplified_colors=(
+      "%F{cyan}"
+      "%F{yellow}"
+      "%F{magenta}"
+      "%F{red}"
+      "%F{green}"
+    )
+  fi
+
+  # Formats:
+  #   %b - branchname
+  #   %u - unstagedstr (see below)
+  #   %c - stagedstr (see below)
+  #   %a - action (e.g. rebase-i)
+  #   %R - repository path
+  #   %S - path in the repository
+  local branch_format="(${_prompt_steeef_simplified_colors[1]}%b%f%u%c)"
+  local action_format="(${_prompt_steeef_simplified_colors[5]}%a%f)"
+  local unstaged_format="${_prompt_steeef_simplified_colors[2]}●%f"
+  local staged_format="${_prompt_steeef_simplified_colors[5]}●%f"
+
+  # Set vcs_info parameters.
+  zstyle ':vcs_info:*' enable bzr git hg svn
+  zstyle ':vcs_info:*:prompt:*' check-for-changes true
+  zstyle ':vcs_info:*:prompt:*' unstagedstr "${unstaged_format}"
+  zstyle ':vcs_info:*:prompt:*' stagedstr "${staged_format}"
+  zstyle ':vcs_info:*:prompt:*' actionformats "${branch_format}${action_format}"
+  zstyle ':vcs_info:*:prompt:*' formats "${branch_format}"
+  zstyle ':vcs_info:*:prompt:*' nvcsformats   ""
+
+  # Set python-info parameters.
+  zstyle ':prezto:module:python:info:virtualenv' format '(%v)'
+
+  # Define prompts.
+  PROMPT="$(ssh_connection)${_prompt_steeef_simplified_colors[3]}%n%f@${_prompt_steeef_simplified_colors[2]}%m%f ${_prompt_steeef_simplified_colors[5]}%~%f "'${vcs_info_msg_0_}'"$ "
+  RPROMPT="%(?..[%F{red}%?%f] )"
+}
+
+prompt_steeef_simplified_setup "$@"
+
diff --git a/bin/adjust_dpms b/bin/adjust_dpms
index 0391dba..c8e8a0f 100755
--- a/bin/adjust_dpms
+++ b/bin/adjust_dpms
@@ -18,10 +18,10 @@ else
   exit 1
 fi
 
-# loop all pre-compiled programs and check for running instances
+# loop all programs and check for running instances
 for i in "${programs[@]}"
 do
-  pid=$(pidof $i)
+  pid=$(pidof -x $i)
   re='^[0-9]+$'
   if  [[ $pid =~ $re ]]; then
     echo "$i running ($pid)"
@@ -29,17 +29,6 @@ do
   fi
 done
 
-# loop all python2 run programs and check for running instances
-for i in "${python2[@]}"
-do
-  pid=$(pidof python2 $i)
-  re='^[0-9]+$'
-  if [[ $pid =~ $re ]]; then
-    echo "$i running ($pid)"
-    blankoff=1
-  fi
-done
-
 # if valuable programs are running, don't use screen blanking
 if [ $blankoff -gt 0 ]; then
   echo "Some program requires screensaver to be off."
diff --git a/bin/checkip b/bin/checkip
index f7f2f4c..0e9d345 100755
--- a/bin/checkip
+++ b/bin/checkip
@@ -1,3 +1,4 @@
 #!/bin/bash
-ip=`curl -s http://checkip.dyndns.org | sed 's/[a-zA-Z/<> :]//g'`
-echo "$ip"
+#echo "$(curl -s http://checkip.dyndns.org | sed 's/[a-zA-Z/<> :]//g')
+#wget -qO- http://ipecho.net/plain ; echo
+dig +short myip.opendns.com @resolver1.opendns.com
diff --git a/bin/start_jack b/bin/start_jack
index 735d5fa..0c99aab 100755
--- a/bin/start_jack
+++ b/bin/start_jack
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+# Script to start JACK as a user with several settings setup
 export DISPLAY=:0.0
 #jackd -P70 -p16 -t2000 -dalsa -dhw:0,0 -p128 -n3 -r44100 -s > .log/jackd.log 2>&1 &
 
@@ -23,6 +23,7 @@ case "$HOSTNAME" in
     ;;
   "dvzrv")
     DEVICE="/dev/fw1"
+    # TODO: Add settings from separate config file
     if [[ -e $DEVICE && -r $DEVICE && -w $DEVICE ]]; then
       echo "Setting up "$DEVICE" with JACK."
       jack_control start
@@ -31,9 +32,7 @@ case "$HOSTNAME" in
       jack_control ds firewire
       jack_control dps device $DEVICE
       jack_control dps rate 48000
-      #jack_control dps rate 44100
       jack_control dps nperiods 2
-      #jack_control dps period 64
       jack_control dps period 256
       sleep 3
       a2jmidid -e &