diff --git a/.config/gitconfig b/.config/gitconfig
index 2046852..a511da7 100644
--- a/.config/gitconfig
+++ b/.config/gitconfig
@@ -1,35 +1,27 @@
-[alias]
-	trash = !git ls-files --others --directory --exclude-standard | xargs trash-put -v
+[user]
+	name = Tobias Schmidl
 [branch]
 	autosetuprebase = always
 [branch "master"]
 	rebase = true
 [core]
 	autocrlf = input
-	excludesfile = ~/.config/gitignore
-	pager = less -F -X
 	whitespace = tabwidth=4
+	pager = less -F -X
+	excludesfile = ~/.config/gitignore
 [credential]
 	helper = store
 [diff]
-	algorithm = histogram
 	renamelimit = 65536
 	renames = copies
 [difftool]
 	prompt = false
-[fetch]
-	fsckobjects = true
-[filter "lfs"]
-	clean = git-lfs clean -- %f
-	process = git-lfs filter-process
-	required = true
-	smudge = git-lfs smudge -- %f
 [gitflow "prefix"]
-	feature = feature/system/
+	feature = dev/
 	versiontag = v
 [http]
 	sslverify = true
-	sslversion = tlsv1.3
+	sslversion = tlsv1.2
 [merge]
 	conflictstyle = diff3
 	renormalize = true
@@ -37,28 +29,35 @@
 [pack]
 	threads = 0
 [pager]
-	diff = diffr | less -FRX
 	log = diffr | less -FRX
 	show = diffr | less -FRX
+	diff = diffr | less -FRX
 [pull]
 	rebase = true
-[rebase]
-	autosquash = true
+[transfer]
+	fsckobjects = true
+[fetch]
+	fsckobjects = true
 [receive]
 	fsckobjects = true
-[sendemail]
-	transferEncoding = 8bit
-[svn]
-	addAuthorFrom = true
-	findcopiesharder = true
-	rmdir = true
-	useLogAuthor = true
+[rebase]
+	autosquash = true
 [tig]
 	blob-view = line-number:yes,interval=5 text
 	diff-highlight = true
 	line-graphics = utf-8
 	tab-size = 4
-[transfer]
-	fsckobjects = true
-[user]
-	name = Tobias Schmidl
+[filter "lfs"]
+	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+[svn]
+	findcopiesharder = true
+	rmdir = true
+	useLogAuthor = true
+	addAuthorFrom = true
+[alias]
+	trash = !git ls-files --others --directory --exclude-standard | xargs trash-put -v
+[sendemail]
+	transferEncoding = 8bit
diff --git a/.config/htop/htoprc b/.config/htop/htoprc
index 231b428..6172bdf 100644
--- a/.config/htop/htoprc
+++ b/.config/htop/htoprc
@@ -1,79 +1,26 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
-htop_version=3.2.2
-config_reader_min_version=3
-fields=0 48 17 18 38 39 40 2 46 47 49 1
+fields=0 48 17 18 2 46 49 38 39 40 47 102 103 106 107 111 1
+sort_key=46
+sort_direction=1
+hide_threads=0
 hide_kernel_threads=0
 hide_userland_threads=0
-hide_running_in_container=0
 shadow_other_users=0
 show_thread_names=1
 show_program_path=1
 highlight_base_name=1
-highlight_deleted_exe=1
-shadow_distribution_path_prefix=0
 highlight_megabytes=1
 highlight_threads=1
-highlight_changes=0
-highlight_changes_delay_secs=5
-find_comm_in_cmdline=1
-strip_exe_from_cmdline=1
-show_merged_command=0
+tree_view=1
 header_margin=0
-screen_tabs=0
 detailed_cpu_time=1
-cpu_count_from_one=0
-show_cpu_usage=1
-show_cpu_frequency=0
-show_cpu_temperature=0
-degree_fahrenheit=0
+cpu_count_from_zero=1
 update_process_names=0
 account_guest_in_cpu_meter=1
 color_scheme=6
-enable_mouse=1
 delay=15
-hide_function_bar=0
-header_layout=two_50_50
-column_meters_0=LeftCPUs4 Memory Swap
-column_meter_modes_0=1 1 1
-column_meters_1=RightCPUs4 Tasks LoadAverage Uptime
-column_meter_modes_1=1 2 2 2
-tree_view=1
-sort_key=46
-tree_sort_key=0
-sort_direction=-1
-tree_sort_direction=1
-tree_view_always_by_pid=1
-all_branches_collapsed=1
-screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
-.sort_key=PERCENT_CPU
-.tree_sort_key=PID
-.tree_view=1
-.tree_view_always_by_pid=1
-.sort_direction=-1
-.tree_sort_direction=1
-.all_branches_collapsed=1
-screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
-.sort_key=IO_RATE
-.tree_sort_key=PID
-.tree_view=0
-.tree_view_always_by_pid=0
-.sort_direction=-1
-.tree_sort_direction=1
-.all_branches_collapsed=0
-screen:Main=PID USER PRIORITY NICE STATE PERCENT_CPU TIME M_VIRT M_RESIDENT M_SHARE PERCENT_MEM RCHAR WCHAR RBYTES WBYTES IO_RATE Command
-.sort_key=PERCENT_CPU
-.tree_sort_key=PERCENT_CPU
-.tree_view=0
-.tree_view_always_by_pid=0
-.sort_direction=-1
-.tree_sort_direction=-1
-.all_branches_collapsed=0
-screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
-.sort_key=IO_RATE
-.tree_sort_key=PID
-.tree_view=0
-.tree_view_always_by_pid=0
-.sort_direction=-1
-.tree_sort_direction=1
-.all_branches_collapsed=0
+left_meters=LeftCPUs2 Load Memory Swap
+left_meter_modes=1 1 1 1
+right_meters=RightCPUs2 Tasks LoadAverage Uptime
+right_meter_modes=1 2 2 2