diff --git a/emacs/.emacs.d/snippets/.dir-locals.el b/emacs/.emacs.d/snippets/.dir-locals.el
deleted file mode 100644
index f88a6f9..0000000
--- a/emacs/.emacs.d/snippets/.dir-locals.el
+++ /dev/null
@@ -1,2 +0,0 @@
-((nil
-  (require-final-newline . nil)))
diff --git a/emacs/.emacs.d/snippets/.gitignore b/emacs/.emacs.d/snippets/.gitignore
deleted file mode 100644
index 28bb317..0000000
--- a/emacs/.emacs.d/snippets/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.yas-compiled-snippets.el
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/conf-mode/section b/emacs/.emacs.d/snippets/conf-mode/section
deleted file mode 100644
index 55be8f8..0000000
--- a/emacs/.emacs.d/snippets/conf-mode/section
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Xorg Section
-# key: Section
-# --
-Section "$1"
-        Identifier "$2"
-        $0
-EndSection
diff --git a/emacs/.emacs.d/snippets/css-mode/box-shadow b/emacs/.emacs.d/snippets/css-mode/box-shadow
deleted file mode 100644
index 82fe9d5..0000000
--- a/emacs/.emacs.d/snippets/css-mode/box-shadow
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: box-shadow
-# key: boxshadow
-# --
-box-shadow: ${1:offset-x} ${2:offset-y}${3: [blur-radius]}${4: [spread-radius]}${5: [color]};
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/emacs-lisp-mode/depends-on b/emacs/.emacs.d/snippets/emacs-lisp-mode/depends-on
deleted file mode 100644
index 4f99d92..0000000
--- a/emacs/.emacs.d/snippets/emacs-lisp-mode/depends-on
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: depends-on
-# key: do
-# --
-(depends-on "$1")$0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/emacs-lisp-mode/face b/emacs/.emacs.d/snippets/emacs-lisp-mode/face
deleted file mode 100644
index 9fdbbb2..0000000
--- a/emacs/.emacs.d/snippets/emacs-lisp-mode/face
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: face
-# key: face
-# --
-   `($1 ((t (${2::foreground} $0))))
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/haml-mode/faq b/emacs/.emacs.d/snippets/haml-mode/faq
deleted file mode 100644
index 4d1a9e2..0000000
--- a/emacs/.emacs.d/snippets/haml-mode/faq
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: FAQ Question & Answer
-# key: faq
-# expand-env: ((yas-indent-line 'fixed))
-# --
-%dt
-  = link_to '#' do
-    .expand_icon
-    $1
-%dd
-  %p
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/html-mode/block b/emacs/.emacs.d/snippets/html-mode/block
deleted file mode 100644
index 6510011..0000000
--- a/emacs/.emacs.d/snippets/html-mode/block
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: block
-# key: block
-# --
-{% block $1 %}
-  $0
-{% endblock %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/html-mode/for b/emacs/.emacs.d/snippets/html-mode/for
deleted file mode 100644
index 01d9c44..0000000
--- a/emacs/.emacs.d/snippets/html-mode/for
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: for
-# key: for
-# condition: pony-tpl-minor-mode
-# --
-{% for $1 in $2 %}
-  $0
-{% endfor %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/html-mode/generic-block b/emacs/.emacs.d/snippets/html-mode/generic-block
deleted file mode 100644
index 82d40c7..0000000
--- a/emacs/.emacs.d/snippets/html-mode/generic-block
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: Template Block
-# key: %
-# condition: pony-tpl-minor-mode
-# --
-{% $1 %}
-   $0
-{% end$1 %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/html-mode/script b/emacs/.emacs.d/snippets/html-mode/script
deleted file mode 100644
index e50dbf5..0000000
--- a/emacs/.emacs.d/snippets/html-mode/script
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: script
-# key: script
-# --
-<script src="$1" type="${2:text/javascript}" language="${3:javascript}"></script>
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/html-mode/trans-with-cap b/emacs/.emacs.d/snippets/html-mode/trans-with-cap
deleted file mode 100644
index 4f20a33..0000000
--- a/emacs/.emacs.d/snippets/html-mode/trans-with-cap
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: trans with cap
-# key: trans
-# condition: pony-tpl-minor-mode
-# --
-{% trans "$1"|capfirst %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/nxml-mode/pencil-property b/emacs/.emacs.d/snippets/nxml-mode/pencil-property
deleted file mode 100644
index 7fafcb8..0000000
--- a/emacs/.emacs.d/snippets/nxml-mode/pencil-property
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: PencilProperty
-# key: p
-# --
-<Property name="$1"
-          displayName="$2"
-          type="$3">$4</Property>
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/nxml-mode/pencil-property-value b/emacs/.emacs.d/snippets/nxml-mode/pencil-property-value
deleted file mode 100644
index 5da3d10..0000000
--- a/emacs/.emacs.d/snippets/nxml-mode/pencil-property-value
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: PropertyValue
-# key: pv
-# --
-<PropertyValue name="$1">$2</PropertyValue>
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/nxml-mode/pencil-shortcut b/emacs/.emacs.d/snippets/nxml-mode/pencil-shortcut
deleted file mode 100644
index e760d27..0000000
--- a/emacs/.emacs.d/snippets/nxml-mode/pencil-shortcut
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Shortcut
-# key: s
-# --
-<Shortcut displayName="$1"
-          icon="$2"
-          to="$3">
-  $0
-</Shortcut>
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/org-mode/codeblock b/emacs/.emacs.d/snippets/org-mode/codeblock
deleted file mode 100644
index a200b08..0000000
--- a/emacs/.emacs.d/snippets/org-mode/codeblock
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: codeblock
-# key: code
-# --
-#+begin_src $1
-  $0
-#+end_src
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/org-mode/heading b/emacs/.emacs.d/snippets/org-mode/heading
deleted file mode 100644
index 9d5451e..0000000
--- a/emacs/.emacs.d/snippets/org-mode/heading
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: Heading
-# key: *
-# --
-${1:*} ${2:TODO} $3
-${1:$(make-string (length text) ?\ )} :PROPERTIES:
-${1:$(make-string (length text) ?\ )} :CATEGORY: $4
-${1:$(make-string (length text) ?\ )} :END:
-${1:$(make-string (length text) ?\ )} $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/org-mode/project b/emacs/.emacs.d/snippets/org-mode/project
deleted file mode 100644
index 269d655..0000000
--- a/emacs/.emacs.d/snippets/org-mode/project
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- mode: snippet -*-
-# name: project
-# key: project
-# --
-#+TITLE: ${1:project_name}
-#+LINK: src    ${2:http://code.ryuslash.org/cgit.cgi/$3$1/}
-#+LINK: tar_gz $2${4:snapshot/$1-master}.tar.gz
-#+LINK: zip    $2$4.zip
-#+STARTUP: showall
-
-#+begin_html
-  <script src="/keyjs.js" type="text/javascript"></script>
-  <script type="text/javascript">
-    keyjs_initialize({ "u": [ "keyjs_goto", "../index.html" ],
-                       "h": [ "keyjs_goto", "http://ryuslash.org" ] });
-  </script>
-#+end_html
-
-#+INCLUDE: "dlmenu.inc"
-
-* About
-
-  ${5:A short description about $1}
-
-  | $0Status   | $6 |
-  | Language | $7 |
-  | License  | ${8:GPLv3} |
-
-* Why?
-
-  ${9:Why did you even think of writing $1?}
-
-* Features
-
-  ${10:$1 does...}
-
-* Dependencies
-
-  ${11:$1 needs to have...}
-
-* Download
-
-  ${12:To download $1...}
-
-* Install
-
-  ${13:To install $1...}
-
-* Usage
-
-  ${14:Using $1...}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/org-mode/snippet b/emacs/.emacs.d/snippets/org-mode/snippet
deleted file mode 100644
index 67f15d5..0000000
--- a/emacs/.emacs.d/snippets/org-mode/snippet
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- mode: snippet -*-
-# name: snippet
-# key: snippet
-# --
-#+TITLE: ${1:snippet-name}
-#+OPTIONS: toc:nil
-
-* $1
-
-  ${2:A short description abount $1}
-
-  #+BEGIN_SRC $3 :tangle yes
-$0
-  #+END_SRC
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/php-mode/function b/emacs/.emacs.d/snippets/php-mode/function
deleted file mode 100644
index ab4cf2c..0000000
--- a/emacs/.emacs.d/snippets/php-mode/function
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: function
-# key: function
-# --
-function $1($2)
-{
-    $0
-}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/php-mode/wpheader.php b/emacs/.emacs.d/snippets/php-mode/wpheader.php
deleted file mode 100644
index 2c70f93..0000000
--- a/emacs/.emacs.d/snippets/php-mode/wpheader.php
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: WP Plugin Header
-# key: header
-# --
-/*
- * Plugin Name: $1
- * Plugin URI: $2
- * Description: $3
- * Version: ${4:1.0}
- * Author: ${5:Tom Willemse}
- * Author URI: ${6:https://ryuslash.org}
- * License: ${7:GPLv2}
- */
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/defm_empty b/emacs/.emacs.d/snippets/python-mode/defm_empty
deleted file mode 100644
index baa976e..0000000
--- a/emacs/.emacs.d/snippets/python-mode/defm_empty
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- coding: utf-8 -*-
-# name: Empty Defmethod
-# key: defm
-# --
-def ${1:name}(self, *args, **kwargs):
-    '''$2'''
-    return super(${3:`(progn (re-search-backward "^[ \t]*class \\(.+\\)(") (match-string 1)))`}, self).$1(*args, **kwargs)
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/form b/emacs/.emacs.d/snippets/python-mode/form
deleted file mode 100644
index 225d5e4..0000000
--- a/emacs/.emacs.d/snippets/python-mode/form
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: Model Form
-# key: form
-# --
-class ${1:Model}Form(forms.ModelForm):
-    '''Form for the $1 model.'''
-
-    class Meta:
-        model = $1
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/form_valid b/emacs/.emacs.d/snippets/python-mode/form_valid
deleted file mode 100644
index c5a7e58..0000000
--- a/emacs/.emacs.d/snippets/python-mode/form_valid
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: Record form
-# key: defm
-# --
-@record_activity(model=${1:`(progn (re-search-backward "^[ \t]*model = \\([a-zA-Z_].*\\)$") (match-string 1))`})
-def form_valid(self, form):
-    '''Make sure any changes to the $1 model get logged.'''
-    return super(${2:`(progn (re-search-backward "^[ \t]*class \\(.+\\)(") (match-string 1)))`}, self).form_valid(form)
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/form_valid_with_return b/emacs/.emacs.d/snippets/python-mode/form_valid_with_return
deleted file mode 100644
index fac23bc..0000000
--- a/emacs/.emacs.d/snippets/python-mode/form_valid_with_return
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: form_valid with return
-# key: formvalid
-# --
-def form_valid(self, form):
-    rv = super(`(let ((name (python-info-current-defun))) (substring name 0 (cl-position ?. name)))`, self).form_valid(form)
-    $0
-    return rv
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/import_from b/emacs/.emacs.d/snippets/python-mode/import_from
deleted file mode 100644
index d9cc4e2..0000000
--- a/emacs/.emacs.d/snippets/python-mode/import_from
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-# name: from ... import ...
-# contributor: Tom Willemse
-# key: from
-# --
-from ${1:module} import ${2:class_or_module}
diff --git a/emacs/.emacs.d/snippets/python-mode/method b/emacs/.emacs.d/snippets/python-mode/method
deleted file mode 100644
index 7c033cf..0000000
--- a/emacs/.emacs.d/snippets/python-mode/method
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: method
-# key: defm
-# --
-def $1(self$2):
-    '''$3'''
-    $0
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/permission_guard b/emacs/.emacs.d/snippets/python-mode/permission_guard
deleted file mode 100644
index ab53895..0000000
--- a/emacs/.emacs.d/snippets/python-mode/permission_guard
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: Permission guard
-# key: defm
-# --
-@method_decorator(permission_required('$1',
-                                      raise_exception=True))
-def dispatch(self, *args, **kwargs):
-    '''Make sure the user has the $1 permission.'''
-    return super(${3:`(progn (re-search-backward "^[ \t]*class \\(.+\\)(") (match-string 1)))`}, self).dispatch(*args, **kwargs)
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/python-mode/url b/emacs/.emacs.d/snippets/python-mode/url
deleted file mode 100644
index 00ade72..0000000
--- a/emacs/.emacs.d/snippets/python-mode/url
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: url
-# key: url
-# --
-url(r'^$1', $2, name='$3'),
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/ruby-mode/ProductSeed b/emacs/.emacs.d/snippets/ruby-mode/ProductSeed
deleted file mode 100644
index 7e836c2..0000000
--- a/emacs/.emacs.d/snippets/ruby-mode/ProductSeed
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: ProductSeed
-# key: pseed
-# --
-Product.find_or_create_by_name(parent_id: $1, name: '$2', description: '$3', price: '$4')
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/ruby-mode/ProductSeedHW b/emacs/.emacs.d/snippets/ruby-mode/ProductSeedHW
deleted file mode 100644
index 843b32e..0000000
--- a/emacs/.emacs.d/snippets/ruby-mode/ProductSeedHW
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: ProductSeedWithHW
-# key: pseed
-# --
-Product.find_or_create_by_name(parent_id: $1, name: '$2', description: '$3', price: '$4', width_in_cm: '$5', height_in_cm: '$6', width_in_mm: '${5:$(round (* 10 (string-to-int yas-text)))}', height_in_mm: '${6:$(round (* 10 (string-to-int yas-text)))}')
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/ruby-mode/ProductSeedHWGroup b/emacs/.emacs.d/snippets/ruby-mode/ProductSeedHWGroup
deleted file mode 100644
index 25594c5..0000000
--- a/emacs/.emacs.d/snippets/ruby-mode/ProductSeedHWGroup
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: ProductSeedWithHWGroup
-# key: pseed
-# --
-Product.find_or_create_by_name(parent_id: $1, name: '$2', description: 'Small', price: '20.00', width_in_cm: '25.00', height_in_cm: '21.00', width_in_mm: '250', height_in_mm: '210')
-Product.find_or_create_by_name(parent_id: $1, name: '$2', description: 'Medium', price: '20.00', width_in_cm: '30.00', height_in_cm: '25.80', width_in_mm: '300', height_in_mm: '258')
-Product.find_or_create_by_name(parent_id: $1, name: '$2', description: 'Large', price: '20.00', width_in_cm: '35.00', height_in_cm: '30.00', width_in_mm: '350', height_in_mm: '300')
-Product.find_or_create_by_name(parent_id: $1, name: '$2', description: 'Extra large', price: '20.00', width_in_cm: '40.00', height_in_cm: '34.00', width_in_mm: '400', height_in_mm: '340')
diff --git a/emacs/.emacs.d/snippets/ruby-mode/describe b/emacs/.emacs.d/snippets/ruby-mode/describe
deleted file mode 100644
index acd3a6b..0000000
--- a/emacs/.emacs.d/snippets/ruby-mode/describe
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: describe
-# key: desc
-# --
-describe '$1' do
-  $0
-end
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/ruby-mode/do b/emacs/.emacs.d/snippets/ruby-mode/do
deleted file mode 100644
index 3c556fc..0000000
--- a/emacs/.emacs.d/snippets/ruby-mode/do
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: do
-# key: do
-# --
-do$0
-end
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/ruby-mode/factory b/emacs/.emacs.d/snippets/ruby-mode/factory
deleted file mode 100644
index 619b2e5..0000000
--- a/emacs/.emacs.d/snippets/ruby-mode/factory
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: factory
-# key: factory
-# --
-FactoryGirl.define do
-  factory :${1:`(file-name-sans-extension (file-name-nondirectory buffer-file-name))`} do
-    $0
-  end
-end
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/ruby-mode/fill_in b/emacs/.emacs.d/snippets/ruby-mode/fill_in
deleted file mode 100644
index 854b029..0000000
--- a/emacs/.emacs.d/snippets/ruby-mode/fill_in
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: fill_in
-# key: fin
-# --
-fill_in '$1', with: $2
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/ruby-mode/mod b/emacs/.emacs.d/snippets/ruby-mode/mod
deleted file mode 100644
index 9af7d23..0000000
--- a/emacs/.emacs.d/snippets/ruby-mode/mod
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: module ... end
-# key: mod
-# group: definitions
-# --
-module ${1:`(let ((fn (capitalize (file-name-nondirectory
-                                   (directory-file-name
-                                    default-directory)))))
-              (replace-regexp-in-string "_" "" fn t t))`}
-  $0
-end
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/ruby-mode/reduce b/emacs/.emacs.d/snippets/ruby-mode/reduce
deleted file mode 100644
index 3d4bfe4..0000000
--- a/emacs/.emacs.d/snippets/ruby-mode/reduce
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: reduce
-# key: reduce
-# --
-reduce { |a, e| $0 }
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/twig-mode/_self b/emacs/.emacs.d/snippets/twig-mode/_self
deleted file mode 100644
index c441690..0000000
--- a/emacs/.emacs.d/snippets/twig-mode/_self
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: _self
-# key: _self
-# --
-{% import _self as ${1:`(file-name-nondirectory (file-name-sans-extension buffer-file-name))`} %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/twig-mode/blk b/emacs/.emacs.d/snippets/twig-mode/blk
deleted file mode 100644
index bb100a3..0000000
--- a/emacs/.emacs.d/snippets/twig-mode/blk
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: block
-# key: blk
-# --
-{% block $1 %}
-  $0
-{% endblock %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/twig-mode/def b/emacs/.emacs.d/snippets/twig-mode/def
deleted file mode 100644
index 78dead4..0000000
--- a/emacs/.emacs.d/snippets/twig-mode/def
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: default value
-# key: def
-# --
-{% if $1 is not defined %}
-  {% set $1 = $2 %}
-{% endif %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/twig-mode/ext b/emacs/.emacs.d/snippets/twig-mode/ext
deleted file mode 100644
index 501cae8..0000000
--- a/emacs/.emacs.d/snippets/twig-mode/ext
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: extends
-# key: ext
-# --
-{% extends "$1" %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/twig-mode/for b/emacs/.emacs.d/snippets/twig-mode/for
deleted file mode 100644
index 01c0cc5..0000000
--- a/emacs/.emacs.d/snippets/twig-mode/for
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: for
-# key: for
-# --
-{% for $1 in $2 %}
-  `yas-selected-text`$0
-{% endfor %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/twig-mode/if b/emacs/.emacs.d/snippets/twig-mode/if
deleted file mode 100644
index a9385d9..0000000
--- a/emacs/.emacs.d/snippets/twig-mode/if
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: if
-# key: if
-# --
-{% if $1 %}
-  $0
-{% endif %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/twig-mode/ife b/emacs/.emacs.d/snippets/twig-mode/ife
deleted file mode 100644
index a4d18f3..0000000
--- a/emacs/.emacs.d/snippets/twig-mode/ife
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: if...else
-# key: ife
-# --
-{% if $1 %}
-  $0
-{% else %}
-
-{% endif %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/twig-mode/iif b/emacs/.emacs.d/snippets/twig-mode/iif
deleted file mode 100644
index df26b61..0000000
--- a/emacs/.emacs.d/snippets/twig-mode/iif
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: Inline if
-# key: iif
-# --
-{% if $1 %}$0{% endif %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/twig-mode/imp b/emacs/.emacs.d/snippets/twig-mode/imp
deleted file mode 100644
index 01ceb69..0000000
--- a/emacs/.emacs.d/snippets/twig-mode/imp
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: import
-# key: imp
-# --
-{% import "${1:module}" as ${1:$(if (string-match "/\\\\([^/]*\\\\)$" yas-text)
-                                    (match-string 1 yas-text)
-                                  yas-text)} %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/twig-mode/mac b/emacs/.emacs.d/snippets/twig-mode/mac
deleted file mode 100644
index d4e480a..0000000
--- a/emacs/.emacs.d/snippets/twig-mode/mac
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: macro
-# key: mac
-# --
-{% macro ${1:name}(${2:args}) %}
-  $0
-{% endmacro %}
\ No newline at end of file
diff --git a/emacs/.emacs.d/snippets/twig-mode/set b/emacs/.emacs.d/snippets/twig-mode/set
deleted file mode 100644
index 715c828..0000000
--- a/emacs/.emacs.d/snippets/twig-mode/set
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet; require-final-newline: nil -*-
-# name: set
-# key: set
-# --
-{% set $1 = $2 %}
\ No newline at end of file