diff --git a/.vimrc b/.vimrc
index a71f03e..2bda6d7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -4,8 +4,7 @@ filetype off
 set rtp+=~/.vim/bundle/Vundle.vim
 " Download plug-ins to the ~/.vim/plugged/ directory
 call vundle#begin('~/.vim/plugged')
-" Let Vundle manage Vundle; muss immer der erste eintrag sein
-
+" Let Vundle manage Vundle; muss immer der erste Eintrag sein
 Plugin 'VundleVim/Vundle.vim'
 " statusline
 Plugin 'itchyny/lightline.vim'
@@ -20,48 +19,58 @@ Plugin 'tpope/vim-sleuth'
 call vundle#end()
 
 
-" allgemeine Optionen
-set showcmd         " Show (partial) command in status line.
+" ### allgemeine Optionen
+" ### Suche
+" While typing a search command, show immediately where the so far typed pattern matches.
+set incsearch
+" global bei suche immer mit an
+set gdefault
+" When there is a previous search pattern, highlight all its matches.
+set hlsearch
+" Ignore case in search patterns.
+set ignorecase
+" Override the 'ignorecase' option if the search pattern contains upper case characters.
+set smartcase
+
+" ### Nummern
+" Show line numbers.
+set number
+" toggle linenumbers
+nmap <C-n> :set nonu!<CR>
+
+" ### Kommandovervollständigung
+" https://www.reddit.com/r/vim/comments/oo9gms/any_way_to_get_vim_to_not_defaulting_to_the_first/h5wygix/?context=8&depth=9
+set wildmode=longest,list,full
+set wildmenu
+set wildignore=*.o,*~
+
+" ### Rest
+" Show (partial) command in status line.
+set showcmd
 set virtualedit=onemore
 set encoding=UTF-8
 set visualbell
 set ruler
 set undolevels=1000
 set backspace=indent,eol,start
-set hidden 					" ermögliche das bearbiete buffer in der hintergrund können
-set ignorecase      " Ignore case in search patterns.
-set smartcase       " Override the 'ignorecase' option if the search pattern contains upper case characters.
-
-set nowrap          " verhindert zeilenumbrüche
+" ermögliche das bearbeitete buffer in der hintergrund können
+set hidden
+" verhindert zeilenumbrüche
+set nowrap
 set showbreak=+++
-set wrap linebreak  " https://vim.fandom.com/wiki/Automatic_word_wrapping
+" https://vim.fandom.com/wiki/Automatic_word_wrapping
+set wrap linebreak
+" Enable syntax highlighting
+syntax on
+" Enable mouse drag on window splits
+set mouse=a
+" https://unix.stackexchange.com/questions/12535/how-to-copy-text-from-vim-to-an-external-program
+set clipboard=unnamedplus
+" zeige "matching" klammer usw.
+set showmatch
 
-set hlsearch        " When there is a previous search pattern, highlight all its matches.
-set gdefault        " global bei suche immer mit an
-set incsearch       " While typing a search command, show immediately where the so far typed pattern matches.
-
-set number          " Show line numbers.
-" toggle linenumbers
-nmap <C-n> :set nonu!<CR>
-
-syntax on           " Enable syntax highlighting
-set shiftwidth=4    " Number of spaces to use for each step of (auto)indent.
-set mouse=a                       " Enable mouse drag on window splits
-set clipboard=unnamedplus         " https://unix.stackexchange.com/questions/12535/how-to-copy-text-from-vim-to-an-external-program
-
-" Keybindings
-" Ctrl+S zum speichern
-nmap  <C-s> :w<CR>
-" ctrl+W zum schließen
-nmap  <C-w> :q<CR>
-" ctrl+P: set paste
-nmap <C-p> :set paste!<CR>
-" ctrl+t fuer neuen tab
-nmap <C-t> :tabnew<CR>
-" leader-key
-:let mapleader = ","
-
-" lightline/statusline
+" ### Plugins"
+" ### lightline/statusline
 " blende insert/visual/... in der commandline aus, steht in lightline
 set noshowmode
 set laststatus=2
@@ -75,9 +84,7 @@ let g:lightline = {
       \ },
       \ }
 
-
-
-" ripgrep und ctrlp
+" ### ripgrep und ctrlp
 " sudo apt install ripgrep(rg)
 if executable('rg')
       let g:ctrlp_user_command = 'rg %s --files --hidden --color=never --glob ""'
@@ -92,11 +99,16 @@ let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$'
 " stelle standard keybinding um
 let g:ctrlp_map = ''
 
-" Kommandovervollständigung
-" https://www.reddit.com/r/vim/comments/oo9gms/any_way_to_get_vim_to_not_defaulting_to_the_first/h5wygix/?context=8&depth=9
-set wildmode=longest,list,full
-set wildmenu
-set wildignore=*.o,*~
 
-" zeige "matching" klammer usw.
-set showmatch
+
+" ### Keybindings
+" Ctrl+S zum speichern
+nmap  <C-s> :w<CR>
+" ctrl+W zum schließen
+nmap  <C-w> :q<CR>
+" ctrl+P: set paste
+nmap <C-p> :set paste!<CR>
+" ctrl+t fuer neuen tab
+nmap <C-t> :tabnew<CR>
+" leader-key
+:let mapleader = ","