diff --git a/config/.local/share/ranger/bookmarks b/config/.local/share/ranger/bookmarks
index a4a07e1..f185da4 100644
--- a/config/.local/share/ranger/bookmarks
+++ b/config/.local/share/ranger/bookmarks
@@ -1,7 +1,6 @@
-':/home/tuan
 u:/home/tuan/Documents/Uni/Studium
 p:/home/tuan/Documents/Protokolle/FSE
 o:/home/tuan/.dotfiles/config
-w:/home/tuan/Documents/Collection/wiki
 m:/run/media/tuan
 a:/home/tuan/Documents/Arbeit
+l:/home/tuan/Local
diff --git a/vim/.vim/config/basics.vim b/vim/.vim/plugin/basics.vim
similarity index 80%
rename from vim/.vim/config/basics.vim
rename to vim/.vim/plugin/basics.vim
index 41a4caa..6110cff 100644
--- a/vim/.vim/config/basics.vim
+++ b/vim/.vim/plugin/basics.vim
@@ -19,3 +19,5 @@ set softtabstop=4
 set splitbelow
 set splitright
 
+" Statusbar
+set statusline=%F%m%r%h%w[%L][%{&ff}]%y[%p%%][%04l,%04v]
diff --git a/vim/.vim/config/functions.vim b/vim/.vim/plugin/functions.vim
similarity index 100%
rename from vim/.vim/config/functions.vim
rename to vim/.vim/plugin/functions.vim
diff --git a/vim/.vim/config/remaps.vim b/vim/.vim/plugin/remaps.vim
similarity index 76%
rename from vim/.vim/config/remaps.vim
rename to vim/.vim/plugin/remaps.vim
index 4c35bf3..c4df4a5 100644
--- a/vim/.vim/config/remaps.vim
+++ b/vim/.vim/plugin/remaps.vim
@@ -3,11 +3,13 @@ nnoremap <C-J> <C-W><C-J>
 nnoremap <C-K> <C-W><C-K>
 nnoremap <C-L> <C-W><C-L>
 nnoremap <C-H> <C-W><C-H>
-nnoremap J :bn<Enter>
-nnoremap K :bp<Enter>
+nnoremap J :bn<CR>
+nnoremap K :bp<CR>
+nnoremap u :earlier<CR>
+nnoremap U :later<CR>
 noremap <leader>y "+y
 noremap <C-E> :tabedit<Space>
-noremap <F1> :ter<Enter>
+noremap <F1> :ter<CR>
 nmap 0 ^
 
 " Diaeresis for e.g. german
@@ -20,5 +22,3 @@ inoremap O" Ö
 inoremap jj <Esc>
 inoremap ;s ß
 inoremap ;e €
-
-
diff --git a/vim/.vim/config/settings.vim b/vim/.vim/plugin/settings.vim
similarity index 100%
rename from vim/.vim/config/settings.vim
rename to vim/.vim/plugin/settings.vim
diff --git a/vim/.vim/plugin/skeletons.vim b/vim/.vim/plugin/skeletons.vim
new file mode 100644
index 0000000..36ad0d1
--- /dev/null
+++ b/vim/.vim/plugin/skeletons.vim
@@ -0,0 +1,2 @@
+nnoremap <leader>ctf :-read $HOME/.vim/skeleton/writeup.md<CR>A
+
diff --git a/vim/.vim/skeleton/writeup.md b/vim/.vim/skeleton/writeup.md
new file mode 100644
index 0000000..5335194
--- /dev/null
+++ b/vim/.vim/skeleton/writeup.md
@@ -0,0 +1,10 @@
+# 
+
+Category: 
+ 
+# Challenge
+
+# Solution
+
+# Flag
+``
diff --git a/vim/.vim/spell/de.utf-8.add b/vim/.vim/spell/de.utf-8.add
index c232e16..609a632 100644
--- a/vim/.vim/spell/de.utf-8.add
+++ b/vim/.vim/spell/de.utf-8.add
@@ -626,3 +626,6 @@ Schülerpraktikum
 Cirriculum
 of
 VCS
+Mahngelder
+Gebäudemanagement
+Gebäudemanagements
diff --git a/vim/.vim/spell/de.utf-8.add.spl b/vim/.vim/spell/de.utf-8.add.spl
index e3bcc4c..618726c 100644
Binary files a/vim/.vim/spell/de.utf-8.add.spl and b/vim/.vim/spell/de.utf-8.add.spl differ
diff --git a/vim/.vimrc b/vim/.vimrc
deleted file mode 100644
index 2920e09..0000000
--- a/vim/.vimrc
+++ /dev/null
@@ -1,5 +0,0 @@
-" Load files from somewhere else
-source ~/.vim/config/settings.vim
-source ~/.vim/config/basics.vim
-source ~/.vim/config/remaps.vim
-source ~/.vim/config/functions.vim