diff --git a/.gitignore b/.gitignore
index 5ec2923..93bedf3 100755
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@ emacs/.emacs.d/*
 *.log
 *.pdf
 vim/.vim/bundle/*
+vim/.vim/plugged/*
 vim/.vim/.netrwhist
diff --git a/config/.config/i3/config b/config/.config/i3/config
index b71d050..a6dced7 100644
--- a/config/.config/i3/config
+++ b/config/.config/i3/config
@@ -107,6 +107,7 @@ exec --no-startup-id conky -c ~/.conky/syclo-crimson-bottomleft.conkyrc
 exec --no-startup-id dunst
 exec --no-startup-id ~/.scripts/startup.sh
 exec --no-startup-id llk
+exec --no-startup-id emacs --daemon
 
 ###############################################################################
 ################################# Keybindings #################################
diff --git a/config/.config/ranger/rifle.conf b/config/.config/ranger/rifle.conf
index f95ee2b..6921ec7 100644
--- a/config/.config/ranger/rifle.conf
+++ b/config/.config/ranger/rifle.conf
@@ -4,8 +4,8 @@
 # Define the "editor" for text files as first action
 mime ^text,  label editor = ${VISUAL:-$EDITOR} -- "$@"
 mime ^text,  label pager  = "$PAGER" -- "$@"
-!mime ^text, label editor, ext xml|json|csv|tex|py|pl|rb|js|sh|php|rs|go|html = ${VISUAL:-$EDITOR} -- "$@"
-!mime ^text, label pager,  ext xml|json|csv|tex|py|pl|rb|js|sh|php|rs|go|html = "$PAGER" -- "$@"
+!mime ^text, label editor, ext xml|json|csv|tex|py|pl|rb|js|sh|php|rs|go|org = ${VISUAL:-$EDITOR} -- "$@"
+!mime ^text, label pager,  ext xml|json|csv|tex|py|pl|rb|js|sh|php|rs|go|org = "$PAGER" -- "$@"
 
 ext 1                         = man "$1"
 ext s[wmf]c, has zsnes, X     = zsnes "$1"
diff --git a/config/.config/zathura/zathurarc b/config/.config/zathura/zathurarc
new file mode 100644
index 0000000..94c53e4
--- /dev/null
+++ b/config/.config/zathura/zathurarc
@@ -0,0 +1,3 @@
+set selection-clipboard clipboard
+
+set guioptions none
\ No newline at end of file
diff --git a/config/.local/share/ranger/bookmarks b/config/.local/share/ranger/bookmarks
index 8d51162..5fedd5b 100644
--- a/config/.local/share/ranger/bookmarks
+++ b/config/.local/share/ranger/bookmarks
@@ -7,7 +7,7 @@ l:/home/tuan/Local
 c:/home/tuan/Documents/CTF
 t:/home/tuan/Templates
 w:/home/tuan/workspace_l/Projects
-k:/home/tuan/Documents/CTF/TryHackMe/VulnUniversity
+k:/home/tuan/Documents/Uni/Studium/2017&2018 Wintersemester/Rechnerstrukturen und Betriebssysteme [4,0]/Rechnerstrukturen
 q:/home/tuan/.nextcloud/Quick Drop
-':/home/tuan/.dotfiles/emacs/.emacs.d
+':/home/tuan/.dotfiles/vim/.vim
 e:/home/tuan/Documents/CTF/TryHackMe/Ice/2_Recon
diff --git a/emacs/.emacs.d/config.org b/emacs/.emacs.d/config.org
index fcd4fb3..e4793ab 100644
--- a/emacs/.emacs.d/config.org
+++ b/emacs/.emacs.d/config.org
@@ -5,155 +5,205 @@
 * Preface
   Before installing and using emacs, emacs should be run as a daemon.
   This decreases the loading times of the editor enormously and enables you to return to your former emacs session at any time.
-  To do this you first need to make sure =emacs --daemon= is run during the start up.
-  To access the daemonized emacs you can either run =emacsclient -t= to use it in the terminal or simply =emacsclient= if you want to use the GUI version.
+  To do this you first need to make sure ~emace --daemon~ is run during the start up.
+  To access the daemonized emacs you can either run ~emacsclient -t~ to use it in the terminal or simply ~emacsclient~ if you want to use the GUI version.
   
 * Package installation
 ** Preperation
    Initialize Emacs builtin package system and add the [[https://melpa.org][melpa]]-package repository.
 
-   #+BEGIN_SRC emacs-lisp
-(require 'package)
-(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
-(package-initialize)
-   #+END_SRC
+   #+begin_src emacs-lisp
+     (require 'package)
+     (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
+     (package-initialize)
+     (package-refresh-contents)
+   #+end_src
 
-** Package installation
+** Installation
 *** [[https://github.com/jwiegley/use-package][use-package]]
-    ~A use-package declaration for simplifying your .emacs~
+    =A use-package declaration for simplifying your .emacs=
 
-    #+BEGIN_SRC emacs-lisp
-(unless (package-installed-p 'use-package)
-  (package-refresh-contents)
-  (package-install 'use-package))
+    #+begin_src emacs-lisp
+      (unless (package-installed-p 'use-package)
+	(package-install 'use-package))
 
-(require 'use-package)
-(setq use-package-always-ensure t)
-    #+END_SRC
+      (require 'use-package)
+      (setq use-package-always-ensure t)
+    #+end_src
 
 *** [[https://github.com/myrjola/diminish.el][diminish]]
-    ~Diminished modes are minor modes with no modeline display~
+    =Diminished modes are minor modes with no modeline display=
 
-    #+BEGIN_SRC emacs-lisp
-(use-package diminish)
-    #+END_SRC
+    #+begin_src emacs-lisp
+      (use-package diminish)
+    #+end_src
 
 *** [[https://github.com/emacscollective/no-littering][no-littering]]
-    ~Help keeping ~/.emacs.d clean~
+    =Help keeping ~/.emacs.d clean=
 
-    #+BEGIN_SRC emacs-lisp
-(use-package no-littering)
-    #+END_SRC
+    #+begin_src emacs-lisp
+      (use-package no-littering)
+    #+end_src
 
 *** [[https://github.com/emacs-evil/evil][evil]]/[[https://github.com/emacs-evil/evil-collection][evil-collection]]
-    ~The extensible vi layer for Emacs.~
-    ~A set of keybindings for evil-mode~
+    =The extensible vi layer for Emacs.=
+    =A set of keybindings for evil-mode=
 
-    #+BEGIN_SRC emacs-lisp
-(use-package evil
-  :init
-  (setq evil-want-keybinding nil)
-  :config
-  (evil-mode 1)
-  (setq evil-search-module 'evil-search))
+    #+begin_src emacs-lisp
+      (use-package evil
+	:init
+	(setq evil-want-keybinding nil)
+	:config
+	(evil-mode 1)
+	(setq evil-search-module 'evil-search))
 
-(use-package evil-collection
-  :config
-  (evil-collection-init))
-    #+END_SRC
+      (use-package evil-collection
+	:config
+	(evil-collection-init))
+    #+end_src
 
-*** [[https://github.com/abo-abo/swiper][Ivy/Counsil/Swiper]]
-    ~Ivy - a generic completion frontend for Emacs, Swiper - isearch with an overview, and more. Oh, man!~
+*** [[https://github.com/abo-abo/swiper][Ivy]]/[[https://github.com/abo-abo/swiper][Counsil]]/[[https://github.com/abo-abo/swiper][Swiper]]
+    =Ivy - a generic completion frontend for Emacs, Swiper - isearch with an overview, and more. Oh, man!=
 
-    #+BEGIN_SRC emacs-lisp
-(use-package prescient)
+    #+begin_src emacs-lisp
+      (use-package prescient)
 
-(use-package ivy-prescient
-  :config
-  (ivy-prescient-mode 1))
+      (use-package ivy-prescient
+	:config
+	(ivy-prescient-mode 1))
 
-(use-package ivy)
+      (use-package ivy)
 
-(use-package counsel  
-  :diminish counsel-mode
-  :config
-  (counsel-mode 1))
+      (use-package counsel  
+	:diminish counsel-mode
+	:config
+	(counsel-mode 1))
 
-(use-package swiper
-  :bind (("C-s" . 'swiper)))
-    #+END_SRC
+      (use-package swiper
+	:bind (("C-s" . 'swiper)))
+    #+end_src
+
+*** [[https://magit.vc/][Magit]]
+    =A Git Porcelain inside Emacs.=
+    
+    #+begin_src emacs-lisp
+      (use-package magit)
+    #+end_src
+
+*** [[https://www.gnu.org/software/auctex/][AUCTeX]]
+    =an extensible package for writing and formatting TeX files.=
+
+    #+begin_src emacs-lisp
+      (use-package auctex
+	:defer t
+	:config
+	(setq TeX-parse-self t)
+	(setq-default TeX-master nil)
+	(setq TeX-PDF-mode t))
+    #+end_src
 
 *** [[https://github.com/yjwen/org-reveal][ox-reveal]]
-    ~Exports Org-mode contents to Reveal.js HTML presentation.~
+    =Exports Org-mode contents to Reveal.js HTML presentation.=
 
-    #+BEGIN_SRC emacs-lisp
-(use-package ox-reveal)
-    #+END_SRC
+    #+begin_src emacs-lisp
+      (use-package ox-reveal)
+    #+end_src
 
 *** [[https://github.com/marsmining/ox-twbs][ox-twbs]]
-    ~Export org-mode docs as HTML compatible with Twitter Bootstrap.~
+    =Export org-mode docs as HTML compatible with Twitter Bootstrap.=
 
-    #+BEGIN_SRC emacs-lisp
-(use-package ox-twbs)
-    #+END_SRC
+    #+begin_src emacs-lisp
+      (use-package ox-twbs)
+    #+end_src
 
 *** [[https://github.com/sabof/org-bullets][org-bullets]]
-    ~utf-8 bullets for org-mode~
+    =utf-8 bullets for org-mode=
 
-    #+BEGIN_SRC emacs-lisp
-(use-package org-bullets)
-    #+END_SRC
+    #+begin_src emacs-lisp
+      (use-package org-bullets)
+    #+end_src
+
+*** [[https://elpa.gnu.org/packages/rainbow-mode.html][rainbow-mode]]
+    =Colorize color names in buffers=
+    
+    #+begin_src emacs-lisp
+      (use-package rainbow-mode)
+    #+end_src
+
+*** [[https://github.com/Fanael/rainbow-delimiters][rainbow-delimiters]]
+    =Emacs rainbow delimiters mode=
+
+    #+begin_src emacs-lisp
+      (use-package rainbow-delimiters)
+    #+end_src
+
+*** [[https://github.com/joaotavora/yasnippet][yasnippet]]
+    =A template system for Emacs=
+    
+    #+begin_src emacs-lisp
+      (use-package yasnippet)
+    #+end_src
 
 * Appearance
   This section is for appearance customization. Either via packages or manually.
 
 ** [[https://github.com/kuanyui/moe-theme.el][moe-theme]]
-   ~A customizable colorful eye-candy theme for Emacser. Moe, moe, kyun!~
+   =A customizable colorful eye-candy theme for Emacser. Moe, moe, kyun!=
 
-   #+BEGIN_SRC emacs-lisp
-(use-package moe-theme
-  :config
-  (moe-dark))
-   #+END_SRC
+   #+begin_src emacs-lisp
+     (use-package moe-theme
+       :config
+       (moe-dark))
+   #+end_src
 
 
 ** Transparent Emacs
    Makes the default color of the background of emacs the same as the terminals color.
    This is kind of a janky solution, but it works.
 
-   #+BEGIN_SRC emacs-lisp
-(add-hook 'window-setup-hook
-      '(lambda ()
-	 (set-face-background 'default "unspecified-bg")))
-   #+END_SRC
+   #+begin_src emacs-lisp
+     (add-hook 'window-setup-hook
+	       '(lambda ()
+		  (set-face-background 'default "unspecified-bg")))
+   #+end_src
 
 ** Menubar
 
    Remove the menu-bar at the top of the screen for better immersion.
 
-   #+BEGIN_SRC emacs-lisp
-(menu-bar-mode -1)
-   #+END_SRC
+   #+begin_src emacs-lisp
+     (menu-bar-mode -1)
+   #+end_src
 
 * Emacs Configuration
 ** Symbolic Links
    Follow symlinks without asking for confirmation.
 
-   #+BEGIN_SRC emacs-lisp
-   (setq vc-follow-symlinks t)
-   #+END_SRC
+   #+begin_src emacs-lisp
+     (setq vc-follow-symlinks t)
+   #+end_src
 
 * Mode Configuration
 ** Org-Mode
-   Always unfold every section in org files.
-
-   #+BEGIN_SRC emacs-lisp
-(add-hook 'org-mode-hook #'org-show-all)
-   #+END_SRC
-
    Enable org-bullets and hide leading stars.
-   #+BEGIN_SRC emacs-lisp
-(add-hook 'org-mode-hook 
-  (lambda () 
-    (org-bullets-mode 1)))
-   #+END_SRC
+
+   #+begin_src emacs-lisp
+     (add-hook 'org-mode-hook 
+	       (lambda () 
+		 (org-bullets-mode 1)))
+   #+end_src
+
+   Enables specific languages for org-babel, so those languages can be used and compiled in code blocks and disable the compilation concirmation. The code afterwords enables proper indentation inside those source blocks.
+   #+begin_src emacs-lisp
+     (org-babel-do-load-languages
+      'org-babel-load-languages
+      '((emacs-lisp . t)
+	(C . t)
+	(makefile . t)
+	(shell . t)
+	(latex . t)
+	(python . t)))
+
+     (setq org-confirm-babel-evaluate nil)
+     (setq org-src-tab-acts-natively t)
+   #+end_src
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 54e0973..806751c 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -1,17 +1,2 @@
 (org-babel-load-file "~/.emacs.d/config.org")
 (put 'upcase-region 'disabled nil)
-
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(package-selected-packages
-   '(ox-reveal ox-hugo theme-magic use-package ox-twbs org-bullets no-littering moe-theme ivy-prescient evil-collection diminish counsel)))
-
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(org-hide ((t (:foreground "#000000")))))
diff --git a/emacs/.emacs.d/snippets/c++-mode/cerr b/emacs/.emacs.d/snippets/c++-mode/cerr
deleted file mode 100644
index 921b3a0..0000000
--- a/emacs/.emacs.d/snippets/c++-mode/cerr
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: cerr
-# key: err
-# --
-cerr << $0;
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/c++-mode/cin b/emacs/.emacs.d/snippets/c++-mode/cin
deleted file mode 100644
index 401ccda..0000000
--- a/emacs/.emacs.d/snippets/c++-mode/cin
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: cin
-# key: cin
-# --
-cin >> $0;
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/c++-mode/cout b/emacs/.emacs.d/snippets/c++-mode/cout
deleted file mode 100644
index 1c8e600..0000000
--- a/emacs/.emacs.d/snippets/c++-mode/cout
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: York Zhao <gtdplatform@gmail.com>
-# name: cout
-# key: cout
-# --
-`(progn (goto-char (point-min)) (unless (re-search-forward
-"^using\\s-+namespace std;" nil 'no-errer) "std::"))
-`cout << $0${1: << "${2:\n}"};
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/c++-mode/fori b/emacs/.emacs.d/snippets/c++-mode/fori
deleted file mode 100644
index 7676a89..0000000
--- a/emacs/.emacs.d/snippets/c++-mode/fori
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: fori
-# key: fori
-# --
-for (${1:auto }${2:it} = ${3:var}.begin(); $2 != $3.end(); ++$2) {
-    $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/c++-mode/io b/emacs/.emacs.d/snippets/c++-mode/io
deleted file mode 100644
index 1355dac..0000000
--- a/emacs/.emacs.d/snippets/c++-mode/io
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: io
-# key: io
-# --
-#include <iostream>
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/emacs-lisp-mode/add-hook b/emacs/.emacs.d/snippets/emacs-lisp-mode/add-hook
deleted file mode 100644
index de8d16d..0000000
--- a/emacs/.emacs.d/snippets/emacs-lisp-mode/add-hook
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; -*-
-#contributor: Xah Lee (XahLee.org)
-#name: add-hook
-#key: add-hook
-#key: ah
-# --
-(add-hook '${1:name}-hook ${2:'${3:function}})$0
diff --git a/emacs/.emacs.d/snippets/java-mode/apr_assert b/emacs/.emacs.d/snippets/java-mode/apr_assert
deleted file mode 100644
index a3942be..0000000
--- a/emacs/.emacs.d/snippets/java-mode/apr_assert
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: apr_assert
-# key: apr_assert
-# --
-if (Globals.useAssertions) {
-   ${1:assert ..};
-}
diff --git a/emacs/.emacs.d/snippets/java-mode/assert b/emacs/.emacs.d/snippets/java-mode/assert
deleted file mode 100644
index 686ffea..0000000
--- a/emacs/.emacs.d/snippets/java-mode/assert
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: assert
-# key: as
-# --
-assert ${1:expression};
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/assertEquals b/emacs/.emacs.d/snippets/java-mode/assertEquals
deleted file mode 100644
index ce23dae..0000000
--- a/emacs/.emacs.d/snippets/java-mode/assertEquals
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: assertEquals
-# key: ae
-# group: test
-# --
-Assert.assertEquals($1, $2);
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/cls b/emacs/.emacs.d/snippets/java-mode/cls
deleted file mode 100644
index 88f534f..0000000
--- a/emacs/.emacs.d/snippets/java-mode/cls
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: cls
-# key: cls
-# --
-class ${1:Class} {
-      $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/constructor b/emacs/.emacs.d/snippets/java-mode/constructor
deleted file mode 100644
index 602e496..0000000
--- a/emacs/.emacs.d/snippets/java-mode/constructor
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: constructor
-# key: c
-# --
-public ${1:Class} (${2:args}) {
-       $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/define test method b/emacs/.emacs.d/snippets/java-mode/define test method
deleted file mode 100644
index fd9daf6..0000000
--- a/emacs/.emacs.d/snippets/java-mode/define test method	
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: define test method
-# key: dt
-# --
-@Test
-public void test${1:Name}() throws Exception {
-    $0
-}
diff --git a/emacs/.emacs.d/snippets/java-mode/doc b/emacs/.emacs.d/snippets/java-mode/doc
deleted file mode 100644
index 88f556e..0000000
--- a/emacs/.emacs.d/snippets/java-mode/doc
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: doc
-# key: /*
-# --
-/**
- * ${1:documentation}
- */
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/equals b/emacs/.emacs.d/snippets/java-mode/equals
deleted file mode 100644
index e990966..0000000
--- a/emacs/.emacs.d/snippets/java-mode/equals
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: equals
-# key: eq
-# --
-public boolean equals(${1:Class} other) {
-       $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/file_class b/emacs/.emacs.d/snippets/java-mode/file_class
deleted file mode 100644
index e0a46f6..0000000
--- a/emacs/.emacs.d/snippets/java-mode/file_class
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: file_class
-# key: file
-# --
-public class ${1:`(file-name-base
-                    (or (buffer-file-name)
-                        (buffer-name)))`} {
-  $0
-}
diff --git a/emacs/.emacs.d/snippets/java-mode/for b/emacs/.emacs.d/snippets/java-mode/for
deleted file mode 100644
index 833827b..0000000
--- a/emacs/.emacs.d/snippets/java-mode/for
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: for
-# key: for
-# --
-for (${1:int i = 0}; ${2:i < N}; ${3:i++}) {
-    $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/fori b/emacs/.emacs.d/snippets/java-mode/fori
deleted file mode 100644
index a417f2c..0000000
--- a/emacs/.emacs.d/snippets/java-mode/fori
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: fori
-# key: fori
-# --
-for (${1:Object el} : ${2:iterator}) {
-    $0
-}
diff --git a/emacs/.emacs.d/snippets/java-mode/getter b/emacs/.emacs.d/snippets/java-mode/getter
deleted file mode 100644
index 747f9f4..0000000
--- a/emacs/.emacs.d/snippets/java-mode/getter
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: getter
-# key: g
-# --
-public ${1:int} get${2:Field}() {
-       return ${3:field};
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/if b/emacs/.emacs.d/snippets/java-mode/if
deleted file mode 100644
index cae545f..0000000
--- a/emacs/.emacs.d/snippets/java-mode/if
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: if
-# key: if
-# --
-if (${1:condition}) {
-   $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/ife b/emacs/.emacs.d/snippets/java-mode/ife
deleted file mode 100644
index 975643f..0000000
--- a/emacs/.emacs.d/snippets/java-mode/ife
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: ife
-# key: ife
-# --
-if (${1:cond}) {
-    $2
-}
-else {
-     $3
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/import b/emacs/.emacs.d/snippets/java-mode/import
deleted file mode 100644
index 56235a2..0000000
--- a/emacs/.emacs.d/snippets/java-mode/import
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: import
-# key: imp
-# --
-import ${1:System.};
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/iterator b/emacs/.emacs.d/snippets/java-mode/iterator
deleted file mode 100644
index 69fb2ac..0000000
--- a/emacs/.emacs.d/snippets/java-mode/iterator
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: iterator
-# key: iterator
-# --
-public Iterator<${1:type}> iterator() {
-       $0
-}
diff --git a/emacs/.emacs.d/snippets/java-mode/javadoc b/emacs/.emacs.d/snippets/java-mode/javadoc
deleted file mode 100644
index 5bc9051..0000000
--- a/emacs/.emacs.d/snippets/java-mode/javadoc
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: javadoc
-# key: doc
-# --
-/**
- * $0
- *
- */
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/lambda b/emacs/.emacs.d/snippets/java-mode/lambda
deleted file mode 100644
index a73a7a5..0000000
--- a/emacs/.emacs.d/snippets/java-mode/lambda
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: lambda
-# key: \
-# --
-(${1:args}) -> ${2:expression};
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/main b/emacs/.emacs.d/snippets/java-mode/main
deleted file mode 100644
index b24e49d..0000000
--- a/emacs/.emacs.d/snippets/java-mode/main
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: main
-# key: main
-# --
-public static void main(String[] args) {
-       $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/main_class b/emacs/.emacs.d/snippets/java-mode/main_class
deleted file mode 100644
index 624b31c..0000000
--- a/emacs/.emacs.d/snippets/java-mode/main_class
+++ /dev/null
@@ -1,11 +0,0 @@
-# contributor: L. Guruprasad <lgp171188@gmail.com>
-# name: main_class
-# key: main_class
-# --
-class `(file-name-nondirectory (file-name-sans-extension (buffer-file-name)))`
-{
-public static void main(String args[])
-{
-$0
-}
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/method b/emacs/.emacs.d/snippets/java-mode/method
deleted file mode 100644
index 7a6b9ed..0000000
--- a/emacs/.emacs.d/snippets/java-mode/method
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: method
-# key: m
-# --
-${1:public} ${2:void} ${3:name}(${4:args}) {
-            $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/new b/emacs/.emacs.d/snippets/java-mode/new
deleted file mode 100644
index f06091d..0000000
--- a/emacs/.emacs.d/snippets/java-mode/new
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: new
-# key: new
-# --
-${1:Type} ${2:obj} = new ${3:Constr}(${4:args});
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/override b/emacs/.emacs.d/snippets/java-mode/override
deleted file mode 100644
index 9878c85..0000000
--- a/emacs/.emacs.d/snippets/java-mode/override
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: override
-# key: o
-# --
-@Override
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/param b/emacs/.emacs.d/snippets/java-mode/param
deleted file mode 100644
index 4a1f44d..0000000
--- a/emacs/.emacs.d/snippets/java-mode/param
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: param
-# key: param
-# --
-@param ${1:paramater} $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/printf b/emacs/.emacs.d/snippets/java-mode/printf
deleted file mode 100644
index f93c965..0000000
--- a/emacs/.emacs.d/snippets/java-mode/printf
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: printf
-# key: printf
-# --
-System.out.printf("$0%n");
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/println b/emacs/.emacs.d/snippets/java-mode/println
deleted file mode 100644
index 7dd8f0d..0000000
--- a/emacs/.emacs.d/snippets/java-mode/println
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: println
-# key: pr
-# --
-System.out.println("${1:text}");
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/return b/emacs/.emacs.d/snippets/java-mode/return
deleted file mode 100644
index 5712e0c..0000000
--- a/emacs/.emacs.d/snippets/java-mode/return
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: return
-# key: r
-# --
-return $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/test b/emacs/.emacs.d/snippets/java-mode/test
deleted file mode 100644
index a37d115..0000000
--- a/emacs/.emacs.d/snippets/java-mode/test
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: test
-# key: test
-# --
-@Test
-public void test_${1:Case}() {
-       $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/testClass b/emacs/.emacs.d/snippets/java-mode/testClass
deleted file mode 100644
index b01a68f..0000000
--- a/emacs/.emacs.d/snippets/java-mode/testClass
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# name: testClass
-# key: tc
-# --
-import junit.framework.*;
-import junit.textui.*;
-
-public class Test${1:Class} extends TestCase {
-       protected void setUp() {
-                 $0
-       }
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/this b/emacs/.emacs.d/snippets/java-mode/this
deleted file mode 100644
index 45201b4..0000000
--- a/emacs/.emacs.d/snippets/java-mode/this
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: this
-# key: .
-# --
-this.$1 = $1;
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/toString b/emacs/.emacs.d/snippets/java-mode/toString
deleted file mode 100644
index 0382a9e..0000000
--- a/emacs/.emacs.d/snippets/java-mode/toString
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: toString
-# key: toStr
-# --
-public String toString() {
-       $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/java-mode/try b/emacs/.emacs.d/snippets/java-mode/try
deleted file mode 100644
index 1a17ba3..0000000
--- a/emacs/.emacs.d/snippets/java-mode/try
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: try
-# key: try
-# --
-try {
-    $0
-}
-catch (${1:Throwable e}) {
-      ${2:System.out.println("Error " + e.getMessage());
-      e.printStackTrace();}
-}
diff --git a/emacs/.emacs.d/snippets/java-mode/value b/emacs/.emacs.d/snippets/java-mode/value
deleted file mode 100644
index 7ec38ef..0000000
--- a/emacs/.emacs.d/snippets/java-mode/value
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: value
-# key: val
-# --
-final ${1:int} ${2:n} = $0;
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/latex-mode/fspoll b/emacs/.emacs.d/snippets/latex-mode/fspoll
deleted file mode 100644
index 32bef12..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/fspoll
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: Template of polls for FS
-# key: fspoll
-# --
-\begin{tabular}{ccc}
-  \toprule
-  Ja & Nein & Enthaltung \\\\
-  \midrule
-  3 & 1 & 9 \\\\
-  \bottomrule
-\end{tabular}	
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/latex-mode/item b/emacs/.emacs.d/snippets/latex-mode/item
deleted file mode 100644
index d4773f5..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/item
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: item
-# key: -
-# --
-\item $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/latex-mode/itemize b/emacs/.emacs.d/snippets/latex-mode/itemize
deleted file mode 100644
index 09a848f..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/itemize
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: itemize
-# key: it
-# --
-\begin{itemize}
-\item $0
-\end{itemize}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/latex-mode/moderncv b/emacs/.emacs.d/snippets/latex-mode/moderncv
deleted file mode 100644
index 8de90bb..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/moderncv
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- mode: snippet -*-
-# name: full template of moderncv class
-# key: moderncv
-# --
-\documentclass[${1:options}]{moderncv}
-
-\firstname{$3}
-\familyname{$4}
-
-\moderncvstyle{${5:casual}}
-\moderncvcolor{${6:blue}}
-
-\begin{document}
-$0
-\end{document}
diff --git a/emacs/.emacs.d/snippets/latex-mode/moderncv-cvcomputer b/emacs/.emacs.d/snippets/latex-mode/moderncv-cvcomputer
deleted file mode 100644
index d73a6f0..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/moderncv-cvcomputer
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: moderncv-cvcomputer
-# key: cvcomp
-# --
-\cvcomputer{${1:category}}{${2:programs}}{${3:category}}{${3:programs}}
-$0
diff --git a/emacs/.emacs.d/snippets/latex-mode/moderncv-cventry b/emacs/.emacs.d/snippets/latex-mode/moderncv-cventry
deleted file mode 100644
index 8a7b656..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/moderncv-cventry
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: moderncv-cventry
-# key: cventry
-# --
-\cventry{${1:year}}{${2:job}}{${3:employer}}{${4:city}}{${5:description}}
-$0
diff --git a/emacs/.emacs.d/snippets/latex-mode/moderncv-cvlanguage b/emacs/.emacs.d/snippets/latex-mode/moderncv-cvlanguage
deleted file mode 100644
index c9dd65b..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/moderncv-cvlanguage
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: moderncv-cvlanguage
-# key: cvlang
-# --
-\cvlanguage{${1:language}}{${2:skill-level}}{${3:comment}}
-$0
diff --git a/emacs/.emacs.d/snippets/latex-mode/moderncv-cvline b/emacs/.emacs.d/snippets/latex-mode/moderncv-cvline
deleted file mode 100644
index a193fed..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/moderncv-cvline
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: moderncv-cvline
-# key: cvline
-# --
-\cvline{${1:hobby}}{${2:Description}}
-$0
diff --git a/emacs/.emacs.d/snippets/latex-mode/moderncv-cvlistdoubleitem b/emacs/.emacs.d/snippets/latex-mode/moderncv-cvlistdoubleitem
deleted file mode 100644
index 41f86c6..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/moderncv-cvlistdoubleitem
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: moderncv-cvlistdoubleitem
-# key: cvditem
-# --
-\cvlistdoubleitem{${1:item}}{${2:item}}
-$0
diff --git a/emacs/.emacs.d/snippets/latex-mode/moderncv-cvlistitem b/emacs/.emacs.d/snippets/latex-mode/moderncv-cvlistitem
deleted file mode 100644
index d50fc8c..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/moderncv-cvlistitem
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: moderncv-cvlistitem
-# key: cvitem
-# --
-\cvlistitem{${1:item}}
-$0
diff --git a/emacs/.emacs.d/snippets/latex-mode/section b/emacs/.emacs.d/snippets/latex-mode/section
deleted file mode 100644
index aa2990e..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/section
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: section
-# key: sec
-# --
-\section{${1:name}}
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/latex-mode/subsec b/emacs/.emacs.d/snippets/latex-mode/subsec
deleted file mode 100644
index 461c010..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/subsec
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: subsec
-# key: sub
-# --
-\subsection{${1:name}}
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/latex-mode/template b/emacs/.emacs.d/snippets/latex-mode/template
deleted file mode 100644
index 5fbd078..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- mode: snippet -*-
-# name: template
-# key: template
-# --
-\documentclass{article}[12pt]
-
-\usepackage{titling}
-\usepackage[onehalfspacing]{setspace}
-\usepackage[a4paper, left=2.5cm, right=2cm, top=2cm, bottom=2cm]{geometry}
-\usepackage{hyperref}
-\usepackage[ngerman]{babel}
-\usepackage{datetime}
-\pagenumbering{gobble}
-\fontfamily{sans}
-
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/latex-mode/usepackage b/emacs/.emacs.d/snippets/latex-mode/usepackage
deleted file mode 100644
index ed620e2..0000000
--- a/emacs/.emacs.d/snippets/latex-mode/usepackage
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: usepackage
-# key: use
-# --
-\usepackage{${1:name}}
-
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/makefile-mode/template b/emacs/.emacs.d/snippets/makefile-mode/template
new file mode 100644
index 0000000..478c59f
--- /dev/null
+++ b/emacs/.emacs.d/snippets/makefile-mode/template
@@ -0,0 +1,12 @@
+CC = gcc
+CFLAGS = 
+RM = rm
+TARGET = $0
+
+all: ${TARGET}
+
+${TARGET}: ${TARGET}.c
+	${CC} ${CFLAGS} -o ${TARGET} ${TARGET}.c
+
+clean:
+	${RM} ${TARGET}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/org-mode/add-hook b/emacs/.emacs.d/snippets/org-mode/add-hook
deleted file mode 100644
index de8d16d..0000000
--- a/emacs/.emacs.d/snippets/org-mode/add-hook
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; -*-
-#contributor: Xah Lee (XahLee.org)
-#name: add-hook
-#key: add-hook
-#key: ah
-# --
-(add-hook '${1:name}-hook ${2:'${3:function}})$0
diff --git a/emacs/.emacs.d/snippets/org-mode/color b/emacs/.emacs.d/snippets/org-mode/color
deleted file mode 100644
index fcb3806..0000000
--- a/emacs/.emacs.d/snippets/org-mode/color
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: color
-# key: col
-# --
-\color{$0} 
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/org-mode/elisp b/emacs/.emacs.d/snippets/org-mode/elisp
deleted file mode 100644
index cf16299..0000000
--- a/emacs/.emacs.d/snippets/org-mode/elisp
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: elisp
-# key: elisp_
-# --
-#+BEGIN_SRC emacs-lisp
-$0
-#+END_SRC
diff --git a/emacs/.emacs.d/snippets/org-mode/srcblock b/emacs/.emacs.d/snippets/org-mode/srcblock
new file mode 100644
index 0000000..2badf46
--- /dev/null
+++ b/emacs/.emacs.d/snippets/org-mode/srcblock
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: source block
+# key: src
+# --
+#+BEGIN_SRC $0
+$1
+#+END_SRC
diff --git a/emacs/.emacs.d/snippets/org-mode/transitions b/emacs/.emacs.d/snippets/org-mode/transitions
deleted file mode 100644
index 18ed49c..0000000
--- a/emacs/.emacs.d/snippets/org-mode/transitions
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: transitions
-# key: tran
-# --
-S_{$1}\rightarrow{}S_{$2}
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/.yas-parents b/emacs/.emacs.d/snippets/python-mode/.yas-parents
deleted file mode 100644
index 75d003f..0000000
--- a/emacs/.emacs.d/snippets/python-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-prog-mode
diff --git a/emacs/.emacs.d/snippets/python-mode/.yas-setup.el b/emacs/.emacs.d/snippets/python-mode/.yas-setup.el
deleted file mode 100644
index 1af8703..0000000
--- a/emacs/.emacs.d/snippets/python-mode/.yas-setup.el
+++ /dev/null
@@ -1,39 +0,0 @@
-(require 'yasnippet)
-(defvar yas-text)
-
-(defun python-split-args (arg-string)
-  "Split a python argument string into ((name, default)..) tuples"
-  (mapcar (lambda (x)
-             (split-string x "[[:blank:]]*=[[:blank:]]*" t))
-          (split-string arg-string "[[:blank:]]*,[[:blank:]]*" t)))
-
-(defun python-args-to-docstring ()
-  "return docstring format for the python arguments in yas-text"
-  (let* ((indent (concat "\n" (make-string (current-column) 32)))
-         (args (python-split-args yas-text))
-         (max-len (if args (apply 'max (mapcar (lambda (x) (length (nth 0 x))) args)) 0))
-         (formatted-args (mapconcat
-                (lambda (x)
-                   (concat (nth 0 x) (make-string (- max-len (length (nth 0 x))) ? ) " -- "
-                           (if (nth 1 x) (concat "\(default " (nth 1 x) "\)"))))
-                args
-                indent)))
-    (unless (string= formatted-args "")
-      (mapconcat 'identity (list "Keyword Arguments:" formatted-args) indent))))
-
-(defun python-args-to-docstring-numpy ()
-  "return docstring format for the python arguments in yas-text"
-  (let* ((args (python-split-args yas-text))
-         (format-arg (lambda(arg)
-                       (concat (nth 0 arg) " : " (if (nth 1 arg) ", optional") "\n")))
-         (formatted-params (mapconcat format-arg args "\n"))
-         (formatted-ret (mapconcat format-arg (list (list "out")) "\n")))
-    (unless (string= formatted-params "")
-      (mapconcat 'identity
-                 (list "\nParameters\n----------" formatted-params
-                       "\nReturns\n-------" formatted-ret)
-                 "\n"))))
-
-
-(add-hook 'python-mode-hook
-          '(lambda () (set (make-local-variable 'yas-indent-line) 'fixed)))
diff --git a/emacs/.emacs.d/snippets/python-mode/.yas-setup.elc b/emacs/.emacs.d/snippets/python-mode/.yas-setup.elc
deleted file mode 100644
index 58fca13..0000000
Binary files a/emacs/.emacs.d/snippets/python-mode/.yas-setup.elc and /dev/null differ
diff --git a/emacs/.emacs.d/snippets/python-mode/__contains__ b/emacs/.emacs.d/snippets/python-mode/__contains__
deleted file mode 100644
index 4d4ad50..0000000
--- a/emacs/.emacs.d/snippets/python-mode/__contains__
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __contains__
-# key: cont
-# group: dunder methods
-# --
-def __contains__(self, el):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/__enter__ b/emacs/.emacs.d/snippets/python-mode/__enter__
deleted file mode 100644
index 3dcc3ba..0000000
--- a/emacs/.emacs.d/snippets/python-mode/__enter__
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: __enter__
-# key: ent
-# group: dunder methods
-# --
-def __enter__(self):
-    $0
-
-    return self
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/__exit__ b/emacs/.emacs.d/snippets/python-mode/__exit__
deleted file mode 100644
index cd9de7d..0000000
--- a/emacs/.emacs.d/snippets/python-mode/__exit__
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __exit__
-# key: ex
-# group: dunder methods
-# --
-def __exit__(self, type, value, traceback):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/__getitem__ b/emacs/.emacs.d/snippets/python-mode/__getitem__
deleted file mode 100644
index 939bd1a..0000000
--- a/emacs/.emacs.d/snippets/python-mode/__getitem__
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __getitem__
-# key: getit
-# group: dunder methods
-# --
-def __getitem__(self, ${1:key}):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/__len__ b/emacs/.emacs.d/snippets/python-mode/__len__
deleted file mode 100644
index 9e6c164..0000000
--- a/emacs/.emacs.d/snippets/python-mode/__len__
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __len__
-# key: len
-# group: dunder methods
-# --
-def __len__(self):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/__new__ b/emacs/.emacs.d/snippets/python-mode/__new__
deleted file mode 100644
index 8ccb151..0000000
--- a/emacs/.emacs.d/snippets/python-mode/__new__
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: __new__
-# key: new
-# group: dunder methods
-# --
-def __new__(mcs, name, bases, dct):
-    $0
-    return type.__new__(mcs, name, bases, dct)
diff --git a/emacs/.emacs.d/snippets/python-mode/__setitem__ b/emacs/.emacs.d/snippets/python-mode/__setitem__
deleted file mode 100644
index c7db5b1..0000000
--- a/emacs/.emacs.d/snippets/python-mode/__setitem__
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __setitem__
-# key: setit
-# group: dunder methods
-# --
-def __setitem__(self, ${1:key}, ${2:val}):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/all b/emacs/.emacs.d/snippets/python-mode/all
deleted file mode 100644
index b92c4dc..0000000
--- a/emacs/.emacs.d/snippets/python-mode/all
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: all
-# key: all
-# --
-__all__ = [
-    $0
-]
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/arg b/emacs/.emacs.d/snippets/python-mode/arg
deleted file mode 100644
index f5145ec..0000000
--- a/emacs/.emacs.d/snippets/python-mode/arg
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: arg
-# key: arg
-# group: argparser
-# --
-parser.add_argument('-$1', '--$2',
-                    $0)
diff --git a/emacs/.emacs.d/snippets/python-mode/arg_positional b/emacs/.emacs.d/snippets/python-mode/arg_positional
deleted file mode 100644
index b54fc46..0000000
--- a/emacs/.emacs.d/snippets/python-mode/arg_positional
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: arg_positional
-# key: arg
-# group: argparser
-# --
-parser.add_argument('${1:varname}', $0)
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/assert b/emacs/.emacs.d/snippets/python-mode/assert
deleted file mode 100644
index ec82efe..0000000
--- a/emacs/.emacs.d/snippets/python-mode/assert
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assert
-# key: ass
-# group: testing
-# --
-assert $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/assertEqual b/emacs/.emacs.d/snippets/python-mode/assertEqual
deleted file mode 100644
index 29282b9..0000000
--- a/emacs/.emacs.d/snippets/python-mode/assertEqual
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertEqual
-# key: ae
-# group: testing
-# --
-self.assertEqual($1, $2)
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/assertFalse b/emacs/.emacs.d/snippets/python-mode/assertFalse
deleted file mode 100644
index 41a9dcf..0000000
--- a/emacs/.emacs.d/snippets/python-mode/assertFalse
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertFalse
-# key: af
-# group: testing
-# --
-self.assertFalse($0)
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/assertIn b/emacs/.emacs.d/snippets/python-mode/assertIn
deleted file mode 100644
index 74e1ee7..0000000
--- a/emacs/.emacs.d/snippets/python-mode/assertIn
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertIn
-# key: ai
-# group: testing
-# --
-self.assertIn(${1:member}, ${2:container})
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/assertNotEqual b/emacs/.emacs.d/snippets/python-mode/assertNotEqual
deleted file mode 100644
index 6837407..0000000
--- a/emacs/.emacs.d/snippets/python-mode/assertNotEqual
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertNotEqual
-# key: ane
-# group: testing
-# --
-self.assertNotEqual($1, $2)
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/assertNotIn b/emacs/.emacs.d/snippets/python-mode/assertNotIn
deleted file mode 100644
index 4780a7e..0000000
--- a/emacs/.emacs.d/snippets/python-mode/assertNotIn
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assetNotIn
-# key: an
-# group: testing
-# --
-self.assertNotIn(${1:member}, ${2:container})
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/assertRaises b/emacs/.emacs.d/snippets/python-mode/assertRaises
deleted file mode 100644
index db125da..0000000
--- a/emacs/.emacs.d/snippets/python-mode/assertRaises
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertRaises
-# key: ar
-# group: testing
-# --
-self.assertRaises(${1:Exception}, ${2:fun})
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/assertRaises.with b/emacs/.emacs.d/snippets/python-mode/assertRaises.with
deleted file mode 100644
index c97807e..0000000
--- a/emacs/.emacs.d/snippets/python-mode/assertRaises.with
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertRaises
-# key: ar
-# --
-with self.assertRaises(${1:Exception}):
-    $0
diff --git a/emacs/.emacs.d/snippets/python-mode/assertTrue b/emacs/.emacs.d/snippets/python-mode/assertTrue
deleted file mode 100644
index 1cc59ac..0000000
--- a/emacs/.emacs.d/snippets/python-mode/assertTrue
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: assertTrue
-# key: at
-# group: testing
-# --
-self.assertTrue($0)
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/celery_pdb b/emacs/.emacs.d/snippets/python-mode/celery_pdb
deleted file mode 100644
index 6095b2d..0000000
--- a/emacs/.emacs.d/snippets/python-mode/celery_pdb
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: celery pdb
-# key: cdb
-# group: debug
-# --
-from celery.contrib import rdb; rdb.set_trace()
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/classmethod b/emacs/.emacs.d/snippets/python-mode/classmethod
deleted file mode 100644
index 8e0e106..0000000
--- a/emacs/.emacs.d/snippets/python-mode/classmethod
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: classmethod
-# key: cm
-# group: object oriented
-# --
-@classmethod
-def ${1:meth}(cls, $2):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/cls b/emacs/.emacs.d/snippets/python-mode/cls
deleted file mode 100644
index f857cdb..0000000
--- a/emacs/.emacs.d/snippets/python-mode/cls
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: class
-# key: cls
-# group: object oriented
-# --
-class ${1:class}:
-    $0
diff --git a/emacs/.emacs.d/snippets/python-mode/dec b/emacs/.emacs.d/snippets/python-mode/dec
deleted file mode 100644
index b22c9e9..0000000
--- a/emacs/.emacs.d/snippets/python-mode/dec
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- mode: snippet -*-
-# name: dec
-# key: dec
-# group : definitions
-# --
-def ${1:decorator}(func):
-    $2
-    def _$1(*args, **kwargs):
-        $3
-        ret = func(*args, **kwargs)
-        $4
-        return ret
-
-    return _$1
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/deftest b/emacs/.emacs.d/snippets/python-mode/deftest
deleted file mode 100644
index 394553a..0000000
--- a/emacs/.emacs.d/snippets/python-mode/deftest
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: deftest
-# key: dt
-# group: testing
-# --
-def test_${1:long_name}(self):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/django_test_class b/emacs/.emacs.d/snippets/python-mode/django_test_class
deleted file mode 100644
index 386e305..0000000
--- a/emacs/.emacs.d/snippets/python-mode/django_test_class
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: django_test_class
-# key: tcs
-# group: testing
-# --
-class ${1:Model}Test(TestCase):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/doc b/emacs/.emacs.d/snippets/python-mode/doc
deleted file mode 100644
index 2929e78..0000000
--- a/emacs/.emacs.d/snippets/python-mode/doc
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: doc
-# key: d
-# --
-"""$0
-"""
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/doctest b/emacs/.emacs.d/snippets/python-mode/doctest
deleted file mode 100644
index a5e4bb5..0000000
--- a/emacs/.emacs.d/snippets/python-mode/doctest
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: doctest
-# key: doc
-# group: testing
-# --
->>> ${1:function calls}
-${2:desired output}
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/embed b/emacs/.emacs.d/snippets/python-mode/embed
deleted file mode 100644
index 8d21a7c..0000000
--- a/emacs/.emacs.d/snippets/python-mode/embed
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: embed
-# key: embed
-# --
-from IPython import embed; embed()
diff --git a/emacs/.emacs.d/snippets/python-mode/eq b/emacs/.emacs.d/snippets/python-mode/eq
deleted file mode 100644
index e19c328..0000000
--- a/emacs/.emacs.d/snippets/python-mode/eq
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __eq__
-# key: eq
-# group: dunder methods
-# --
-def __eq__(self, other):
-    return self.$1 == other.$1
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/for b/emacs/.emacs.d/snippets/python-mode/for
deleted file mode 100644
index 0033c87..0000000
--- a/emacs/.emacs.d/snippets/python-mode/for
+++ /dev/null
@@ -1,6 +0,0 @@
-# name: for ... in ... : ...
-# key: for
-# group : control structure
-# --
-for ${var} in ${collection}:
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/from b/emacs/.emacs.d/snippets/python-mode/from
deleted file mode 100644
index 3a4acfc..0000000
--- a/emacs/.emacs.d/snippets/python-mode/from
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: from
-# key: from
-# group : general
-# --
-from ${1:lib} import ${2:funs}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/function b/emacs/.emacs.d/snippets/python-mode/function
deleted file mode 100644
index d7e8f12..0000000
--- a/emacs/.emacs.d/snippets/python-mode/function
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: function
-# key: f
-# group: definitions
-# --
-def ${1:fun}(${2:args}):
-    $0
diff --git a/emacs/.emacs.d/snippets/python-mode/function_docstring b/emacs/.emacs.d/snippets/python-mode/function_docstring
deleted file mode 100644
index f372d26..0000000
--- a/emacs/.emacs.d/snippets/python-mode/function_docstring
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: function_docstring
-# key: fd
-# group: definitions
-# NOTE: Use minimum indentation, because Emacs 25+ doesn't dedent docstrings.
-# --
-def ${1:name}($2):
- \"\"\"$3
- ${2:$(python-args-to-docstring)}
- \"\"\"
- $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/function_docstring_numpy b/emacs/.emacs.d/snippets/python-mode/function_docstring_numpy
deleted file mode 100644
index 00ea351..0000000
--- a/emacs/.emacs.d/snippets/python-mode/function_docstring_numpy
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Egor Panfilov <egor.v.panfilov[at]gmail[dot]com>
-# name: function_docstring_numpy
-# key: fdn
-# group: definitions
-# --
-def ${1:name}($2):
-    \"\"\"$3
-    ${2:$(python-args-to-docstring-numpy)}
-    \"\"\"
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/if b/emacs/.emacs.d/snippets/python-mode/if
deleted file mode 100644
index d1538a9..0000000
--- a/emacs/.emacs.d/snippets/python-mode/if
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: if
-# key: if
-# group : control structure
-# --
-if ${1:cond}:
-    $0
diff --git a/emacs/.emacs.d/snippets/python-mode/ife b/emacs/.emacs.d/snippets/python-mode/ife
deleted file mode 100644
index 4b8f613..0000000
--- a/emacs/.emacs.d/snippets/python-mode/ife
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: ife
-# key: ife
-# group : control structure
-# --
-if $1:
-    $2
-else:
-    $0
diff --git a/emacs/.emacs.d/snippets/python-mode/ifmain b/emacs/.emacs.d/snippets/python-mode/ifmain
deleted file mode 100644
index 9575798..0000000
--- a/emacs/.emacs.d/snippets/python-mode/ifmain
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: ifmain
-# key: ifm
-# --
-if __name__ == '__main__':
-    ${1:main()}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/import b/emacs/.emacs.d/snippets/python-mode/import
deleted file mode 100644
index f34bc39..0000000
--- a/emacs/.emacs.d/snippets/python-mode/import
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: import
-# key: imp
-# group : general
-# --
-import ${1:lib}${2: as ${3:alias}}
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/init b/emacs/.emacs.d/snippets/python-mode/init
deleted file mode 100644
index aece55c..0000000
--- a/emacs/.emacs.d/snippets/python-mode/init
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: init
-# key: init
-# group : definitions
-# --
-def __init__(self${1:, args}):
-    ${2:"${3:docstring}"
-    }$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/init_docstring b/emacs/.emacs.d/snippets/python-mode/init_docstring
deleted file mode 100644
index 51af8db..0000000
--- a/emacs/.emacs.d/snippets/python-mode/init_docstring
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: init_docstring
-# key: id
-# group : definitions
-# --
-def __init__(self$1):
-    \"\"\"$2
-    ${1:$(python-args-to-docstring)}
-    \"\"\"
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/interact b/emacs/.emacs.d/snippets/python-mode/interact
deleted file mode 100644
index 4b412c8..0000000
--- a/emacs/.emacs.d/snippets/python-mode/interact
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: interact
-# key: int
-# --
-import code; code.interact(local=locals())
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/ipdbdebug b/emacs/.emacs.d/snippets/python-mode/ipdbdebug
deleted file mode 100644
index f45ad75..0000000
--- a/emacs/.emacs.d/snippets/python-mode/ipdbdebug
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: ipdb trace
-# key: itr
-# group: debug
-# --
-import ipdb; ipdb.set_trace()
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/iter b/emacs/.emacs.d/snippets/python-mode/iter
deleted file mode 100644
index a4fed13..0000000
--- a/emacs/.emacs.d/snippets/python-mode/iter
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __iter__
-# key: iter
-# group: dunder methods
-# --
-def __iter__(self):
-    return ${1:iter($2)}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/lambda b/emacs/.emacs.d/snippets/python-mode/lambda
deleted file mode 100644
index 08b268b..0000000
--- a/emacs/.emacs.d/snippets/python-mode/lambda
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: lambda
-# key: lam
-# --
-lambda ${1:x}: $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/list b/emacs/.emacs.d/snippets/python-mode/list
deleted file mode 100644
index 63cef24..0000000
--- a/emacs/.emacs.d/snippets/python-mode/list
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: list
-# key: li
-# group : definitions
-# --
-[${1:el} for $1 in ${2:list}]
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/logger_name b/emacs/.emacs.d/snippets/python-mode/logger_name
deleted file mode 100644
index 9759dd9..0000000
--- a/emacs/.emacs.d/snippets/python-mode/logger_name
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: logger_name
-# key: ln
-# --
-logger = logging.getLogger(${1:__name__})
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/logging b/emacs/.emacs.d/snippets/python-mode/logging
deleted file mode 100644
index 568eeea..0000000
--- a/emacs/.emacs.d/snippets/python-mode/logging
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: logging
-# key: log
-# --
-logger = logging.getLogger("${1:name}")
-logger.setLevel(logging.${2:level})
diff --git a/emacs/.emacs.d/snippets/python-mode/main b/emacs/.emacs.d/snippets/python-mode/main
deleted file mode 100644
index 9f3c721..0000000
--- a/emacs/.emacs.d/snippets/python-mode/main
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: main
-# key: main
-# --
-def main():
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/metaclass b/emacs/.emacs.d/snippets/python-mode/metaclass
deleted file mode 100644
index 1e688e4..0000000
--- a/emacs/.emacs.d/snippets/python-mode/metaclass
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: metaclass
-# key: mt
-# group: object oriented
-# --
-__metaclass__ = type
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/method b/emacs/.emacs.d/snippets/python-mode/method
deleted file mode 100644
index 985ef0c..0000000
--- a/emacs/.emacs.d/snippets/python-mode/method
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: method
-# key: m
-# group: object oriented
-# --
-def ${1:method}(self${2:, $3}):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/method_docstring b/emacs/.emacs.d/snippets/python-mode/method_docstring
deleted file mode 100644
index 8f5e78d..0000000
--- a/emacs/.emacs.d/snippets/python-mode/method_docstring
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: method_docstring
-# key: md
-# group: object oriented
-# --
-def ${1:name}(self$2):
-    \"\"\"$3
-    ${2:$(python-args-to-docstring)}
-    \"\"\"
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/not_impl b/emacs/.emacs.d/snippets/python-mode/not_impl
deleted file mode 100644
index 515e353..0000000
--- a/emacs/.emacs.d/snippets/python-mode/not_impl
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: not_impl
-# key: not_impl
-# --
-raise NotImplementedError
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/np b/emacs/.emacs.d/snippets/python-mode/np
deleted file mode 100644
index 9f6327c..0000000
--- a/emacs/.emacs.d/snippets/python-mode/np
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: np
-# key: np
-# group : general
-# --
-import numpy as np
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/parse_args b/emacs/.emacs.d/snippets/python-mode/parse_args
deleted file mode 100644
index aa61070..0000000
--- a/emacs/.emacs.d/snippets/python-mode/parse_args
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: parse_args
-# key: pargs
-# group: argparser
-# --
-def parse_arguments():
-    parser = argparse.ArgumentParser(description='$1')
-    $0
-    return parser.parse_args()
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/parser b/emacs/.emacs.d/snippets/python-mode/parser
deleted file mode 100644
index 29a04ea..0000000
--- a/emacs/.emacs.d/snippets/python-mode/parser
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: parser
-# key: pars
-# group: argparser
-# --
-parser = argparse.ArgumentParser(description='$1')
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/pass b/emacs/.emacs.d/snippets/python-mode/pass
deleted file mode 100644
index 4734f7f..0000000
--- a/emacs/.emacs.d/snippets/python-mode/pass
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: pass
-# key: ps
-# --
-pass
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/pl b/emacs/.emacs.d/snippets/python-mode/pl
deleted file mode 100644
index f0fdd05..0000000
--- a/emacs/.emacs.d/snippets/python-mode/pl
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: Import pyplot
-# key: plt
-# group : general
-# --
-import matplotlib.pyplot as plt
-$0
diff --git a/emacs/.emacs.d/snippets/python-mode/print b/emacs/.emacs.d/snippets/python-mode/print
deleted file mode 100644
index cc1c797..0000000
--- a/emacs/.emacs.d/snippets/python-mode/print
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: print
-# key: p
-# --
-print($0)
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/prop b/emacs/.emacs.d/snippets/python-mode/prop
deleted file mode 100644
index 34e4fa1..0000000
--- a/emacs/.emacs.d/snippets/python-mode/prop
+++ /dev/null
@@ -1,17 +0,0 @@
-# contributor: Mads D. Kristensen <madsdk@gmail.com>
-# name: prop
-# --
-def ${1:foo}():
-    doc = """${2:Doc string}"""
-    def fget(self):
-        return self._$1
-
-    def fset(self, value):
-        self._$1 = value
-
-    def fdel(self):
-        del self._$1
-    return locals()
-$1 = property(**$1())
-
-$0
diff --git a/emacs/.emacs.d/snippets/python-mode/reg b/emacs/.emacs.d/snippets/python-mode/reg
deleted file mode 100644
index c4ebeac..0000000
--- a/emacs/.emacs.d/snippets/python-mode/reg
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: reg
-# key: reg
-# group : general
-# --
-${1:regexp} = re.compile(r"${2:expr}")
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/repr b/emacs/.emacs.d/snippets/python-mode/repr
deleted file mode 100644
index a1f6783..0000000
--- a/emacs/.emacs.d/snippets/python-mode/repr
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __repr__
-# key: repr
-# group: dunder methods
-# --
-def __repr__(self):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/return b/emacs/.emacs.d/snippets/python-mode/return
deleted file mode 100644
index 641a308..0000000
--- a/emacs/.emacs.d/snippets/python-mode/return
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: return
-# key: r
-# --
-return $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/scls b/emacs/.emacs.d/snippets/python-mode/scls
deleted file mode 100644
index 4a10e28..0000000
--- a/emacs/.emacs.d/snippets/python-mode/scls
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: subclass
-# key: scls
-# group: object oriented
-# --
-class ${1:class}(${2:super-class}):
-    $0
diff --git a/emacs/.emacs.d/snippets/python-mode/script b/emacs/.emacs.d/snippets/python-mode/script
deleted file mode 100644
index 55e42e9..0000000
--- a/emacs/.emacs.d/snippets/python-mode/script
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: script
-# key: script
-# --
-#!/usr/bin/env python
-
-def main():
-    pass
-
-if __name__ == '__main__':
-    main()
diff --git a/emacs/.emacs.d/snippets/python-mode/self b/emacs/.emacs.d/snippets/python-mode/self
deleted file mode 100644
index 4461022..0000000
--- a/emacs/.emacs.d/snippets/python-mode/self
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: self
-# key: .
-# group: object oriented
-# --
-self.$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/self_without_dot b/emacs/.emacs.d/snippets/python-mode/self_without_dot
deleted file mode 100644
index a1a0526..0000000
--- a/emacs/.emacs.d/snippets/python-mode/self_without_dot
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: self_without_dot
-# key: s
-# group: object oriented
-# --
-self
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/selfassign b/emacs/.emacs.d/snippets/python-mode/selfassign
deleted file mode 100644
index 95d7b2b..0000000
--- a/emacs/.emacs.d/snippets/python-mode/selfassign
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: selfassign
-# key: sn
-# group: object oriented
-# --
-self.$1 = $1
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/setdef b/emacs/.emacs.d/snippets/python-mode/setdef
deleted file mode 100644
index 2398eb1..0000000
--- a/emacs/.emacs.d/snippets/python-mode/setdef
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: setdef
-# key: setdef
-# --
-${1:var}.setdefault(${2:key}, []).append(${3:value})
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/setup b/emacs/.emacs.d/snippets/python-mode/setup
deleted file mode 100644
index 107abc1..0000000
--- a/emacs/.emacs.d/snippets/python-mode/setup
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- mode: snippet -*-
-# name: setup
-# key: setup
-# group: distribute
-# --
-from setuptools import setup
-
-package = '${1:name}'
-version = '${2:0.1}'
-
-setup(name=package,
-      version=version,
-      description="${3:description}",
-      url='${4:url}'$0)
diff --git a/emacs/.emacs.d/snippets/python-mode/size b/emacs/.emacs.d/snippets/python-mode/size
deleted file mode 100644
index 47a0f38..0000000
--- a/emacs/.emacs.d/snippets/python-mode/size
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: size
-# key: size
-# --
-sys.getsizeof($0)
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/static b/emacs/.emacs.d/snippets/python-mode/static
deleted file mode 100644
index 19c3df9..0000000
--- a/emacs/.emacs.d/snippets/python-mode/static
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: static
-# key: sm
-# --
-@staticmethod
-def ${1:func}($0):
diff --git a/emacs/.emacs.d/snippets/python-mode/str b/emacs/.emacs.d/snippets/python-mode/str
deleted file mode 100644
index b0572e3..0000000
--- a/emacs/.emacs.d/snippets/python-mode/str
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __str__
-# key: str
-# group: dunder methods
-# --
-def __str__(self):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/super b/emacs/.emacs.d/snippets/python-mode/super
deleted file mode 100644
index 23fba5d..0000000
--- a/emacs/.emacs.d/snippets/python-mode/super
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: super
-# key: super
-# group: object oriented
-# --
-super(`(replace-regexp-in-string "\\([.]\\)[^.]+$" ", self)." (python-info-current-defun) nil nil 1)`($1)
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/test_class b/emacs/.emacs.d/snippets/python-mode/test_class
deleted file mode 100644
index 7342c5f..0000000
--- a/emacs/.emacs.d/snippets/python-mode/test_class
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: test_class
-# key: tcs
-# group : testing
-# --
-class Test${1:toTest}(${2:unittest.TestCase}):
-    $0
diff --git a/emacs/.emacs.d/snippets/python-mode/test_file b/emacs/.emacs.d/snippets/python-mode/test_file
deleted file mode 100644
index e4b5315..0000000
--- a/emacs/.emacs.d/snippets/python-mode/test_file
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# name: test_file
-# key: tf
-# group : testing
-# --
-import unittest
-${1:from ${2:test_file} import *}
-
-$0
-
-if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/trace b/emacs/.emacs.d/snippets/python-mode/trace
deleted file mode 100644
index e475d62..0000000
--- a/emacs/.emacs.d/snippets/python-mode/trace
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: trace
-# key: tr
-# group: debug
-# --
-import pdb; pdb.set_trace()
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/try b/emacs/.emacs.d/snippets/python-mode/try
deleted file mode 100644
index 8836de6..0000000
--- a/emacs/.emacs.d/snippets/python-mode/try
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: try
-# key: try
-# --
-try:
-    $1
-except ${2:Exception}:
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/tryelse b/emacs/.emacs.d/snippets/python-mode/tryelse
deleted file mode 100644
index f2e44e4..0000000
--- a/emacs/.emacs.d/snippets/python-mode/tryelse
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: tryelse
-# key: try
-# --
-try:
-    $1
-except $2:
-    $3
-else:
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/unicode b/emacs/.emacs.d/snippets/python-mode/unicode
deleted file mode 100644
index 52d6b8d..0000000
--- a/emacs/.emacs.d/snippets/python-mode/unicode
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __unicode__
-# key: un
-# group: dunder methods
-# --
-def __unicode__(self):
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/unicode_literals b/emacs/.emacs.d/snippets/python-mode/unicode_literals
deleted file mode 100644
index 08e2eb5..0000000
--- a/emacs/.emacs.d/snippets/python-mode/unicode_literals
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: unicode_literals
-# key: fu
-# group: future
-# --
-from __future__ import unicode_literals
diff --git a/emacs/.emacs.d/snippets/python-mode/utf8 b/emacs/.emacs.d/snippets/python-mode/utf8
deleted file mode 100644
index 2ebd82e..0000000
--- a/emacs/.emacs.d/snippets/python-mode/utf8
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: utf-8 encoding
-# key: utf8
-# --
-# -*- coding: utf-8 -*-
diff --git a/emacs/.emacs.d/snippets/python-mode/while b/emacs/.emacs.d/snippets/python-mode/while
deleted file mode 100644
index 7b3539c..0000000
--- a/emacs/.emacs.d/snippets/python-mode/while
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: while
-# key: wh
-# group: control structure
-# --
-while ${1:True}:
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/with b/emacs/.emacs.d/snippets/python-mode/with
deleted file mode 100644
index 7fcbd38..0000000
--- a/emacs/.emacs.d/snippets/python-mode/with
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: with
-# key: with
-# group : control structure
-# --
-with ${1:expr}${2: as ${3:alias}}:
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/with_statement b/emacs/.emacs.d/snippets/python-mode/with_statement
deleted file mode 100644
index 1be3692..0000000
--- a/emacs/.emacs.d/snippets/python-mode/with_statement
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: with_statement
-# key: fw
-# group: future
-# --
-from __future__ import with_statement
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/sh-mode/args b/emacs/.emacs.d/snippets/sh-mode/args
deleted file mode 100644
index 09fe3a0..0000000
--- a/emacs/.emacs.d/snippets/sh-mode/args
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name:args
-# key: args
-# --
-if [ $# -lt ${1:2} ]
-   then $0
-fi
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/sh-mode/for loop b/emacs/.emacs.d/snippets/sh-mode/for loop
deleted file mode 100644
index 438706b..0000000
--- a/emacs/.emacs.d/snippets/sh-mode/for loop	
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: for loop
-# key: for
-# --
-for ${1:var} in ${2:stuff}; do
-    $0
-done
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/sh-mode/function b/emacs/.emacs.d/snippets/sh-mode/function
deleted file mode 100644
index c0f670a..0000000
--- a/emacs/.emacs.d/snippets/sh-mode/function
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: function
-# key: f
-# --
-function ${1:name} {
-         $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/sh-mode/if b/emacs/.emacs.d/snippets/sh-mode/if
deleted file mode 100644
index 2dc537d..0000000
--- a/emacs/.emacs.d/snippets/sh-mode/if
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: if
-# key: if
-# --
-if ${1:[ -f file]}
-   then ${2:do}
-fi
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/sh-mode/ife b/emacs/.emacs.d/snippets/sh-mode/ife
deleted file mode 100644
index f046a3e..0000000
--- a/emacs/.emacs.d/snippets/sh-mode/ife
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: ife
-# key: ife
-# --
-if ${1:cond}
-then ${2:stuff}
-else ${3:other}
-fi
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/sh-mode/safe-bang b/emacs/.emacs.d/snippets/sh-mode/safe-bang
deleted file mode 100644
index ef93a83..0000000
--- a/emacs/.emacs.d/snippets/sh-mode/safe-bang
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: safer bash settings for scripts
-# key: s!
-# --
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-
-$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/sh-mode/while b/emacs/.emacs.d/snippets/sh-mode/while
deleted file mode 100644
index 16b147c..0000000
--- a/emacs/.emacs.d/snippets/sh-mode/while
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: while loop
-# key: while
-# --
-while ${1:cond}; do
-    $0
-done
\ No newline at end of file
diff --git a/vim/.vim/ftplugin/markdown.vim b/vim/.vim/ftplugin/markdown.vim
index dbdbedd..992c5ef 100644
--- a/vim/.vim/ftplugin/markdown.vim
+++ b/vim/.vim/ftplugin/markdown.vim
@@ -10,4 +10,4 @@ vnoremap <C-l> da\overline{<C-o>p}<Esc>
 
 " Compilation
 map <C-c><C-c> <Esc>:!pandoc <C-r>% -o <C-r>%<Del><Del>pdf --from markdown+tex_math_dollars+yaml_metadata_block+hard_line_breaks --template $HOME/Templates/Pandoc/eisvogel --listings &>/dev/null & disown <CR><CR>
-map <C-c><C-d> <Esc>:!evince <C-r>%<Del><Del>pdf &>/dev/null & disown <CR><CR>
+map <C-c><C-d> <Esc>:!zathura <C-r>%<Del><Del>pdf &>/dev/null & disown <CR><CR>
diff --git a/vim/.vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim
index 15f5683..f80ef2a 100644
--- a/vim/.vim/ftplugin/tex.vim
+++ b/vim/.vim/ftplugin/tex.vim
@@ -26,5 +26,5 @@ vnoremap "" da"`<C-R>""'<Esc>
 " Compilation
 noremap <C-c><C-c> <Esc>:!latexmk -pdf -silent "<C-r>%" &>/dev/null & disown <CR>:redraw!<CR><CR>
 noremap <C-c><C-v> <Esc>:!latexmk -c &>/dev/null & disown <CR><CR>
-noremap <C-c><C-d> <Esc>:!evince <C-r>%<Del><Del><Del>pdf &>/dev/null & disown <CR><CR>
+noremap <C-c><C-d> <Esc>:!zathura <C-r>%<Del><Del><Del>pdf &>/dev/null & disown <CR><CR>
 
diff --git a/vim/.vim/plugged/vim-polyglot b/vim/.vim/plugged/vim-polyglot
new file mode 160000
index 0000000..35ea4d2
--- /dev/null
+++ b/vim/.vim/plugged/vim-polyglot
@@ -0,0 +1 @@
+Subproject commit 35ea4d2b9072594b6c0ccf87bde7978ed9f94755
diff --git a/vim/.vim/plugged/vimtex b/vim/.vim/plugged/vimtex
new file mode 160000
index 0000000..2f407de
--- /dev/null
+++ b/vim/.vim/plugged/vimtex
@@ -0,0 +1 @@
+Subproject commit 2f407de42781648809628b566d4b7cd7d7ea0722
diff --git a/zsh/.zshrc b/zsh/.zshrc
index b198e70..32b9d09 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -6,6 +6,7 @@ export PenTestTools=$HOME/Local/PenTesting/
 export CTF=$HOME/Documents/CTF/
 export WORKSPACE=$HOME/workspace_l
 export ZSHRC="$HOME/.zshrc"
+export VISUAL="emacsclient -t"
 
 # Alias
 alias q="exit"
@@ -14,8 +15,8 @@ alias ranger='ranger --choosedir=$HOME/.rangerdir; LASTDIR=`cat $HOME/.rangerdir
 alias xsel='xsel -ib'
 alias msfconsole="msfconsole -x \"db_connect metasploit@msf\""
 alias nmap="nmap -T5 --min-parallelism 100 -Pn"
-alias edaemon="\emacs --daemon"
-alias emacs="emacsclient -t"
+alias ed="\emacs --daemon"
+alias e="emacsclient -t"
 
 # Theme
 ZSH_THEME="agnoster"