diff --git a/.Xdefaults b/.Xdefaults
deleted file mode 100644
index e1c317c..0000000
--- a/.Xdefaults
+++ /dev/null
@@ -1,28 +0,0 @@
-! General
-urxvt*loginShell:      true
-urxvt*scrollBar:       false
-urxvt*secondaryScroll: true
-urxvt*saveLines:       65535
-urxvt*cursorBlink:     false
-urxvt*urgentOnBell:    true
-
-! Extensions
-urxvt*perl-lib:        /usr/lib/urxvt/perl/
-urxvt*perl-ext-common: default,matcher,searchable-scrollback
-urxvt*urlLauncher:     chromium-browser
-urxvt*matcher.button:  1
-! - catch ugly URLs
-!urxvt.cutchars:        `()'*<>[]{|}"
-
-! Appearance
-! - use a bitmap font
-urxvt*font:        -xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*
-urxvt*boldFont:    -xos4-terminux-bold-*-*-*-14-*-*-*-*-*-*-*
-! - cursor
-urxvt*cursorColor: #DCDCCC
-! - pseudo transparency
-urxvt*shading:     20
-urxvt*transparent: true
-! - color scheme
-urxvt.background:  #000000
-urxvt.foreground:  #EBEBFF
\ No newline at end of file
diff --git a/.Xmodmap b/.Xmodmap
deleted file mode 100644
index 9109241..0000000
--- a/.Xmodmap
+++ /dev/null
@@ -1 +0,0 @@
-pointer = 3 2 1
\ No newline at end of file
diff --git a/.conkerorrc b/.conkerorrc
deleted file mode 100644
index b9bd714..0000000
--- a/.conkerorrc
+++ /dev/null
@@ -1,120 +0,0 @@
-// -*- mode: javascript -*-
-require("new-tabs.js");
-require("clicks-in-new-buffer.js");
-
-// STYLE
-/*let (sheet = get_home_directory()) {
-    sheet.append(".conkerorrc.d");
-    sheet.append("stylesheets");
-    sheet.append("tabs.css");
-    register_user_stylesheet(make_uri(sheet));
-}
-function test(window)
-{
-    //var test = window.getElementsByAttribute("id", "tab2-bar");
-    //if (test.length > 0)
-    //    window.removeChild(test);
-    //else
-    //    window.minibuffer.message("no luck");
-    var after = window.document.getElementById("minibuffer");
-    var testtab = window.document.getElementById("tab2-bar");
-
-    window["minibuffer"].message("I'm different!");
-
-    window.tab_bar.destroy();
-    delete window.tab_bar;
-
-    window.tab_bar = testtab;
-    after.parentNode.insertBefore(testtab, after);
-}
-
-add_hook("window_initialize_late_hook", test);*/
-
-// VARIABLES
-// Make middle mouse button open new tab in background
-clicks_in_new_buffer_target = OPEN_NEW_BUFFER_BACKGROUND;
-
-// WEBJUMPS
-define_webjump("delicious",
-               "http://delicious.com/search?p=%s&lc=0&context=userposts%7Cslashed%7C",
-               $alternative="http://delicious.com/slashed");
-define_webjump("gmail",
-               "https://mail.google.com/mail/#search/%s");
-define_webjump("greader",
-               "http://www.google.com/reader/view/#search/%s/",
-               $alternative="http://reader.google.com");
-define_webjump("github",
-               "http://github.com/search?q=%s",
-               $alternative="http://github.com/ryuslash/");
-define_webjump("archwiki",
-               "http://wiki.archlinux.org/index.php?search=%s");
-define_webjump("fedorawiki",
-               "https://fedoraproject.org/wiki/search=%s");
-define_webjump("metal-archives",
-               "http://www.metal-archives.com/search.php?string=%s&type=band");
-
-// FUNCTIONS
-interactive("delicious-post",
-            "bookmark the page via delicious",
-            function (I) {
-                check_buffer(I.buffer, content_buffer);
-                let posturl = 'https://api.del.icio.us/v1/posts/add?&url=' +
-                    encodeURIComponent(
-                        load_spec_uri_string(
-                            load_spec(I.buffer.top_frame))) +
-                    "&description=" +
-                    encodeURIComponent(
-                        yield I.minibuffer.read(
-                            $prompt = "name (required): ",
-                            $initial_value = I.buffer.title)) +
-                    "&tags=" +
-                    encodeURIComponent(
-                        yield I.minibuffer.read(
-                            $prompt = "tags (space delimited): ")) +
-                    "&extended=" +
-                    encodeURIComponent(
-                        yield I.minibuffer.read(
-                            $prompt = "extended description: ")) +
-                    "&replace=no";
-
-                try {
-                    var content = yield send_http_request(
-                        load_spec({uri: posturl}));
-                    I.window.minibuffer.message(content.responseText);
-                } catch (e) { }
-            });
-
-interactive("delicious-post-link",
-            "bookmar the link via delicious",
-            function (I) {
-                bo = yield read_browser_object(I);
-                mylink = load_spec_uri_string(
-                    load_spec(encodeURIComponent(bo)));
-                check_buffer(I.buffer, content_buffer);
-                let postlinkurl = "https://api.del.icio.us/v1/posts/add?&yrl=" +
-                    mylink +
-                    "&description=" +
-                    encodeURIComponent(
-                        yield I.minibuffer.read(
-                            $prompt = "name (required): ",
-                            $initial_value = bo.textContent)) +
-                    "&tags=" +
-                    encodeURIComponent(
-                        yield I.minibuffer.read(
-                            $prompt = "tags (space delimited): ")) +
-                    "&extended=" +
-                    encodeURIComponent(
-                        yield I.minibuffer.read(
-                            $prompt = "extended description: ")) +
-                    "&replace=no";
-
-                try {
-                    var content = yield send_http_request(
-                        load_spec({uri: postlinkurl}));
-                    I.window.minibuffer.message(content.responseText);
-                } catch (e) { }
-            }, $browser_object = browser_object_links);
-
-// KEYMAPPINGS
-define_key(default_global_keymap, "p", "delicious-post");
-define_key(default_global_keymap, "P", "delicious-post-link");
\ No newline at end of file
diff --git a/dotemacs/.emacs b/.emacs
similarity index 100%
rename from dotemacs/.emacs
rename to .emacs
diff --git a/dotemacs/.emacs.d/autopair.el b/.emacs.d/autopair.el
similarity index 100%
rename from dotemacs/.emacs.d/autopair.el
rename to .emacs.d/autopair.el
diff --git a/dotemacs/.emacs.d/batch-mode.el b/.emacs.d/batch-mode.el
similarity index 100%
rename from dotemacs/.emacs.d/batch-mode.el
rename to .emacs.d/batch-mode.el
diff --git a/dotemacs/.emacs.d/color-theme-gruber-darker.el b/.emacs.d/color-theme-gruber-darker.el
similarity index 100%
rename from dotemacs/.emacs.d/color-theme-gruber-darker.el
rename to .emacs.d/color-theme-gruber-darker.el
diff --git a/dotemacs/.emacs.d/color-theme-vibrant-ink.el b/.emacs.d/color-theme-vibrant-ink.el
similarity index 100%
rename from dotemacs/.emacs.d/color-theme-vibrant-ink.el
rename to .emacs.d/color-theme-vibrant-ink.el
diff --git a/dotemacs/.emacs.d/color-theme-weirdness.el b/.emacs.d/color-theme-weirdness.el
similarity index 100%
rename from dotemacs/.emacs.d/color-theme-weirdness.el
rename to .emacs.d/color-theme-weirdness.el
diff --git a/dotemacs/.emacs.d/color-theme.el b/.emacs.d/color-theme.el
similarity index 100%
rename from dotemacs/.emacs.d/color-theme.el
rename to .emacs.d/color-theme.el
diff --git a/dotemacs/.emacs.d/csharp-mode.el b/.emacs.d/csharp-mode.el
similarity index 100%
rename from dotemacs/.emacs.d/csharp-mode.el
rename to .emacs.d/csharp-mode.el
diff --git a/dotemacs/.emacs.d/javascript.el b/.emacs.d/javascript.el
similarity index 100%
rename from dotemacs/.emacs.d/javascript.el
rename to .emacs.d/javascript.el
diff --git a/dotemacs/.emacs.d/rainbow-mode.el b/.emacs.d/rainbow-mode.el
similarity index 100%
rename from dotemacs/.emacs.d/rainbow-mode.el
rename to .emacs.d/rainbow-mode.el
diff --git a/dotemacs/.emacs.d/sqlplus.el b/.emacs.d/sqlplus.el
similarity index 100%
rename from dotemacs/.emacs.d/sqlplus.el
rename to .emacs.d/sqlplus.el
diff --git a/dotemacs/.emacs.d/themes/color-theme-example.el b/.emacs.d/themes/color-theme-example.el
similarity index 100%
rename from dotemacs/.emacs.d/themes/color-theme-example.el
rename to .emacs.d/themes/color-theme-example.el
diff --git a/dotemacs/.emacs.d/themes/color-theme-library.el b/.emacs.d/themes/color-theme-library.el
similarity index 100%
rename from dotemacs/.emacs.d/themes/color-theme-library.el
rename to .emacs.d/themes/color-theme-library.el
diff --git a/dotemacs/.emacs.d/vala-mode.el b/.emacs.d/vala-mode.el
similarity index 100%
rename from dotemacs/.emacs.d/vala-mode.el
rename to .emacs.d/vala-mode.el
diff --git a/.emacs.d/zenburn.el b/.emacs.d/zenburn.el
deleted file mode 100644
index 1238f3c..0000000
--- a/.emacs.d/zenburn.el
+++ /dev/null
@@ -1,1179 +0,0 @@
-;;; zenburn.el --- just some alien fruit salad to keep you in the zone
-;; Copyright (C) 2003, 2004, 2005, 2006  Daniel Brockman
-;; Copyright (C) 2009  Adrian C., Bastien Guerry
-
-;; Author: Daniel Brockman <daniel@brockman.se>
-;; URL: http://www.brockman.se/software/zenburn/zenburn.el
-;; Updated: 2009-07-08 05:27
-
-;; Adrian C. and Bastien Guerry added org-mode faces.
-
-;; This file is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2 of
-;; the License, or (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty
-;; of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-;; See the GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public
-;; License along with GNU Emacs; if not, write to the Free
-;; Software Foundation, 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; Some packages ship with broken implementations of `format-spec';
-;; for example, stable versions of TRAMP and ERC do this.  To fix
-;; this, you can put the following at the end of your ~/.emacs:
-
-;;   (unless (zenburn-format-spec-works-p)
-;;     (zenburn-define-format-spec))
-
-;; Thanks to Jani Nurminen, who created the original zenburn color
-;; theme for vim.  I'm just copying him. :-)
-
-;;; Short-Term Wishlist:
-
-;; Theme the ansi-term faces `term-red', etc., and the ERC faces
-;; `fg:erc-color-face1', etc.
-
-;; Theme `gnus-server-offline-face', `gnus-server-opened-face', and
-;; `gnus-server-denied-face'.  First, find out what they hell they do.
-
-;; Theme `gnus-emphasis-highlight-words' after finding out what it
-;; does.
-
-;; Theme `emms-stream-name-face' and `emms-stream-url-face'.
-
-;; Theme `ido-indicator-face'.
-
-;;; Code:
-
-(require 'color-theme)
-
-(defvar zenburn-fg "#dcdccc")
-(defvar zenburn-bg "#3f3f3f")
-(defvar zenburn-bg+1 "#4f4f4f")
-(defvar zenburn-bg+2 "#5f5f5f")
-(defvar zenburn-red+1 "#dca3a3")
-(defvar zenburn-red "#cc9393")
-(defvar zenburn-red-1 "#bc8383")
-(defvar zenburn-red-2 "#ac7373")
-(defvar zenburn-red-3 "#9c6363")
-(defvar zenburn-red-4 "#8c5353")
-(defvar zenburn-orange "#dfaf8f")
-(defvar zenburn-yellow "#f0dfaf")
-(defvar zenburn-yellow-1 "#e0cf9f")
-(defvar zenburn-yellow-2 "#d0bf8f")
-(defvar zenburn-green-1 "#5f7f5f")
-(defvar zenburn-green "#7f9f7f")
-(defvar zenburn-green+1 "#8fb28f")
-(defvar zenburn-green+2 "#9fc59f")
-(defvar zenburn-green+3 "#afd8af")
-(defvar zenburn-green+4 "#bfebbf")
-(defvar zenburn-cyan "#93e0e3")
-(defvar zenburn-blue+1 "#94bff3")
-(defvar zenburn-blue "#8cd0d3")
-(defvar zenburn-blue-1 "#7cb8bb")
-(defvar zenburn-blue-2 "#6ca0a3")
-(defvar zenburn-blue-3 "#5c888b")
-(defvar zenburn-blue-4 "#4c7073")
-(defvar zenburn-magenta "#dc8cc3")
-
-(eval-after-load 'term
-  '(setq ansi-term-color-vector
-         (vector 'unspecified zenburn-bg
-                 zenburn-red zenburn-green
-                 zenburn-yellow zenburn-blue+1
-                 zenburn-magenta zenburn-cyan)))
-
-(defvar font-lock-pseudo-keyword-face 'font-lock-pseudo-keyword-face)
-(defvar font-lock-operator-face 'font-lock-operator-face)
-
-(defun zenburn-format-spec-works-p ()
-  (and (fboundp 'format-spec)
-       (= (next-property-change
-           0 (format-spec #("<%x>" 0 4 (face (:weight bold)))
-                          '((?x . "foo"))) 4) 4)))
-
-(defun zenburn-format-spec (format specification)
-  "Return a string based on FORMAT and SPECIFICATION.
-FORMAT is a string containing `format'-like specs like \"bash %u %k\",
-while SPECIFICATION is an alist mapping from format spec characters
-to values."
-  (with-temp-buffer
-    (insert format)
-    (goto-char (point-min))
-    (while (search-forward "%" nil t)
-      (cond
-       ;; Quoted percent sign.
-       ((eq (char-after) ?%)
-        (delete-char 1))
-       ;; Valid format spec.
-       ((looking-at "\\([-0-9.]*\\)\\([a-zA-Z]\\)")
-        (let* ((num (match-string 1))
-               (spec (string-to-char (match-string 2)))
-               (val (cdr (assq spec specification))))
-          (unless val
-            (error "Invalid format character: %s" spec))
-          (let ((text (format (concat "%" num "s") val)))
-            (insert-and-inherit text)
-            ;; Delete the specifier body.
-            (delete-region (+ (match-beginning 0) (length text))
-                           (+ (match-end 0) (length text)))
-            ;; Delete the percent sign.
-            (delete-region (1- (match-beginning 0)) (match-beginning 0)))))
-       ;; Signal an error on bogus format strings.
-       (t
-        (error "Invalid format string"))))
-    (buffer-string)))
-
-(defun zenburn-define-format-spec ()
-  (interactive)
-  (fset 'format-spec #'zenburn-format-spec))
-
-(unless (zenburn-format-spec-works-p)
-  (zenburn-define-format-spec))
-
-(eval-after-load 'format-spec
-  '(unless (zenburn-format-spec-works-p)
-     (zenburn-define-format-spec)))
-
-(setq-default mode-line-buffer-identification
-              (list (propertize "%12b" 'face
-                                (list :weight 'bold
-                                      :foreground zenburn-yellow))))
-(setq-default mode-line-frame-identification "")
-(setq-default erc-mode-line-format
-              (concat (propertize "%t" 'face
-                                  (list :weight 'bold
-                                        :foreground zenburn-yellow))
-                      " %a"))
-
-(setq gnus-logo-colors `(,zenburn-bg+2 ,zenburn-bg+1)
-      gnus-mode-line-image-cache
-      '(image :type xpm :ascent center :data "/* XPM */
-static char *gnus-pointer[] = {
-/* width height num_colors chars_per_pixel */
-\"    18    11        2            1\",
-/* colors */
-\". c #dcdccc\",
-\"# c None s None\",
-/* pixels */
-\"######..##..######\",
-\"#####........#####\",
-\"#.##.##..##...####\",
-\"#...####.###...##.\",
-\"#..###.######.....\",
-\"#####.########...#\",
-\"###########.######\",
-\"####.###.#..######\",
-\"######..###.######\",
-\"###....####.######\",
-\"###..######.######\"};"))
-
-(defun zenburn-make-face-alias-clauses (alias-symbols)
-  (let (clauses)
-    (dolist (alias-symbol alias-symbols clauses)
-      (let ((alias-name (symbol-name alias-symbol)))
-        (if (not (string-match "-face" alias-name))
-            (error "Invalid face alias: %s" alias-name)
-          (let ((target-name (replace-regexp-in-string
-                              ".*\\(-face\\)" ""
-                              alias-name nil nil 1)))
-            (push `(,(intern alias-name)
-                    ((t (:inherit ,(intern target-name)))))
-                  clauses)))))))
-
-;;;###autoload
-(defun color-theme-zenburn ()
-  "Just some alien fruit salad to keep you in the zone."
-  (interactive)
-  (color-theme-install
-   (append
-    (list 'color-theme-zenburn
-          `((background-color . ,zenburn-bg)
-            (background-mode . dark)
-            (border-color . ,zenburn-bg)
-            (foreground-color . ,zenburn-fg)
-            (mouse-color . ,zenburn-fg))
-          `((emms-mode-line-icon-color . ,zenburn-fg)
-            (goto-address-mail-face . italic)
-            (goto-address-mail-mouse-face . secondary-selection)
-            (goto-address-url-face . bold)
-            (goto-address-url-mouse-face . hover-highlight)
-            (help-highlight-face . hover-highlight)
-            (imaxima-label-color . ,zenburn-yellow)
-            (imaxima-equation-color . ,zenburn-fg)
-            (list-matching-lines-face . bold)
-            (view-highlight-face . hover-highlight)
-            (widget-mouse-face . hover-highlight))
-
-     '(bold ((t (:weight bold))))
-     '(bold-italic ((t (:italic t :weight bold))))
-     `(default ((t (:background ,zenburn-bg :foreground ,zenburn-fg))))
-     '(fixed-pitch ((t (:weight bold))))
-     '(italic ((t (:slant italic))))
-     '(underline ((t (:underline t))))
-     ;; '(variable-pitch ((t (:font "-*-utopia-regular-r-*-*-12-*-*-*-*-*-*-*"))))
-
-     `(zenburn-background-1 ((t (:background ,zenburn-bg+1))))
-     `(zenburn-background-2 ((t (:background ,zenburn-bg+2))))
-
-     `(zenburn-primary-1 ((t (:foreground ,zenburn-yellow :weight bold))))
-     `(zenburn-primary-2 ((t (:foreground ,zenburn-orange :weight bold))))
-     '(zenburn-primary-3 ((t (:foreground "#dfdfbf" :weight bold))))
-     '(zenburn-primary-4 ((t (:foreground "#dca3a3" :weight bold))))
-     '(zenburn-primary-5 ((t (:foreground "#94bff3" :weight bold))))
-
-     '(zenburn-highlight-damp
-       ((t (:foreground "#88b090" :background "#2e3330"))))
-     '(zenburn-highlight-alerting
-       ((t (:foreground "#e37170" :background "#332323"))))
-     '(zenburn-highlight-subtle
-       ((t (:background "#464646"))))
-
-     '(zenburn-lowlight-1 ((t (:foreground "#606060"))))
-     '(zenburn-lowlight-2 ((t (:foreground "#708070"))))
-
-     `(zenburn-yellow ((t (:foreground ,zenburn-yellow))))
-     `(zenburn-orange ((t (:foreground ,zenburn-orange))))
-     `(zenburn-red ((t (:foreground ,zenburn-red))))
-     `(zenburn-green-1 ((t (:foreground ,zenburn-green-1))))
-     `(zenburn-green ((t (:foreground ,zenburn-green))))
-     `(zenburn-green+1 ((t (:foreground ,zenburn-green+1))))
-     `(zenburn-green+2 ((t (:foreground ,zenburn-green+2))))
-     `(zenburn-green+3 ((t (:foreground ,zenburn-green+3))))
-     `(zenburn-green+4 ((t (:foreground ,zenburn-green+4))))
-     `(zenburn-blue ((t (:foreground ,zenburn-blue))))
-     `(zenburn-blue-1 ((t (:foreground ,zenburn-blue-1))))
-     `(zenburn-blue-2 ((t (:foreground ,zenburn-blue-2))))
-     `(zenburn-blue-3 ((t (:foreground ,zenburn-blue-3))))
-     `(zenburn-blue-4 ((t (:foreground ,zenburn-blue-4))))
-
-     '(zenburn-title ((t (:inherit variable-pitch :weight bold))))
-
-     '(font-lock-builtin
-       ((t (:inherit zenburn-blue))))
-     '(font-lock-comment
-       ((t (:inherit zenburn-green))))
-     '(font-lock-comment-delimiter
-       ((t (:inherit zenburn-lowlight-2))))
-     '(font-lock-constant
-       ((t (:inherit zenburn-primary-4))))
-     '(font-lock-doc
-       ((t (:inherit zenburn-green+1))))
-     `(font-lock-function-name
-       ((t (:foreground ,zenburn-yellow))))
-     '(font-lock-keyword
-       ((t (:inherit zenburn-primary-1))))
-     '(font-lock-negation-char
-       ((t (:inherit zenburn-primary-1))))
-     '(font-lock-preprocessor
-       ((t (:inherit zenburn-blue))))
-     '(font-lock-string
-       ((t (:inherit zenburn-red))))
-     '(font-lock-type
-       ((t (:inherit zenburn-primary-3))))
-     `(font-lock-variable-name
-       ((t (:foreground ,zenburn-yellow))))
-     '(font-lock-warning
-       ((t (:inherit zenburn-highlight-alerting))))
-
-     '(font-lock-pseudo-keyword
-       ((t (:inherit zenburn-primary-2))))
-     '(font-lock-operator
-       ((t (:inherit zenburn-primary-3))))
-
-     '(term-default-bg ((t (nil))))
-     '(term-default-bg-inv ((t (nil))))
-     '(term-default-fg ((t (nil))))
-     '(term-default-fg-inv ((t (nil))))
-     '(term-invisible ((t (nil)))) ;; FIXME: Security risk?
-     '(term-invisible-inv  ((t (nil))))
-     '(term-bold ((t (:weight bold))))
-     '(term-underline ((t (:underline t))))
-
-     ;; FIXME: Map these to ansi-term's faces (`term-red', etc.).
-     '(zenburn-term-dark-gray      ((t (:foreground "#709080"))))
-     '(zenburn-term-light-blue     ((t (:foreground "#94bff3"))))
-     '(zenburn-term-light-cyan     ((t (:foreground "#93e0e3"))))
-     '(zenburn-term-light-green    ((t (:foreground "#c3bf9f"))))
-     '(zenburn-term-light-magenta  ((t (:foreground "#ec93d3"))))
-     '(zenburn-term-light-red      ((t (:foreground "#dca3a3"))))
-     '(zenburn-term-light-yellow   ((t (:foreground "#f0dfaf"))))
-     '(zenburn-term-white          ((t (:foreground "#ffffff"))))
-
-     '(zenburn-term-black          ((t (:foreground "#000000"))))
-     '(zenburn-term-dark-blue      ((t (:foreground "#506070"))))
-     '(zenburn-term-dark-cyan      ((t (:foreground "#8cd0d3"))))
-     '(zenburn-term-dark-green     ((t (:foreground "#60b48a"))))
-     '(zenburn-term-dark-magenta   ((t (:foreground "#dc8cc3"))))
-     '(zenburn-term-dark-red       ((t (:foreground "#705050"))))
-     '(zenburn-term-dark-yellow    ((t (:foreground "#dfaf8f"))))
-     `(zenburn-term-light-gray     ((t (:foreground ,zenburn-fg))))
-
-     '(plain-widget-button
-       ((t (:weight bold))))
-     '(plain-widget-button-pressed
-       ((t (:inverse-video t))))
-     '(plain-widget-documentation
-       ((t (:inherit font-lock-doc))))
-     `(plain-widget-field
-       ((t (:background ,zenburn-bg+2))))
-     '(plain-widget-inactive
-       ((t (:strike-through t))))
-     `(plain-widget-single-line-field
-       ((t (:background ,zenburn-bg+2))))
-
-     `(fancy-widget-button
-       ((t (:background ,zenburn-bg+1
-            :box (:line-width 2 :style released-button)))))
-     `(fancy-widget-button-pressed
-       ((t (:background ,zenburn-bg+1
-            :box (:line-width 2 :style pressed-button)))))
-     `(fancy-widget-button-highlight
-       ((t (:background ,zenburn-bg+1
-            :box (:line-width 2 :style released-button)))))
-     `(fancy-widget-button-pressed-highlight
-       ((t (:background ,zenburn-bg+1
-            :box (:line-width 2 :style pressed-button)))))
-     '(fancy-widget-documentation
-       ((t (:inherit font-lock-doc))))
-     `(fancy-widget-field
-       ((t (:background ,zenburn-bg+2))))
-     '(fancy-widget-inactive
-       ((t (:strike-through t))))
-     `(fancy-widget-single-line-field
-       ((t (:background ,zenburn-bg+2))))
-
-     '(widget-button
-       ((t (:inherit plain-widget-button))))
-     '(widget-button-pressed
-       ((t (:inherit fancy-widget-button-pressed))))
-     '(widget-button-highlight
-       ((t (:inherit fancy-widget-button-highlight))))
-     '(widget-button-pressed-highlight
-       ((t (:inherit fancy-widget-button-pressed-highlight))))
-     '(widget-documentation
-       ((t (:inherit fancy-widget-documentation))))
-     '(widget-field
-       ((t (:inherit fancy-widget-field))))
-     '(widget-inactive
-       ((t (:inherit fancy-widget-inactive))))
-     '(widget-single-line-field
-       ((t (:inherit fancy-widget-single-line-field))))
-
-     `(border ((t (:background ,zenburn-bg))))
-     '(fringe ((t (:inherit zenburn-highlight-subtle))))
-     '(header-line ((t (:inherit zenburn-highlight-damp
-                        :box (:color "#2e3330" :line-width 2)))))
-     '(mode-line ((t (:foreground "#acbc90" :background "#1e2320"
-                      :box (:color "#1e2320" :line-width 2)))))
-     '(mode-line-inactive ((t (:background "#2e3330" :foreground "#88b090"
-                               :box (:color "#2e3330" :line-width 2)))))
-     `(minibuffer-prompt ((t (:foreground ,zenburn-yellow))))
-     `(Buffer-menu-buffer ((t (:inherit zenburn-primary-1))))
-
-     '(region ((t (:foreground "#71d3b4" :background "#233323"))))
-     `(secondary-selection ((t (:foreground ,zenburn-fg :background "#506070"))))
-
-     '(trailing-whitespace ((t (:inherit font-lock-warning))))
-     '(highlight ((t (:underline t))))
-     '(paren ((t (:inherit zenburn-lowlight-1))))
-     '(show-paren-mismatch ((t (:inherit font-lock-warning))))
-     '(show-paren-match ((t (:inherit font-lock-keyword))))
-     '(match ((t (:weight bold))))
-
-     `(cursor ((t (:background ,zenburn-fg :foreground ,zenburn-bg))))
-     '(hover-highlight ((t (:underline t :foreground "#f8f893"))))
-     '(menu ((t nil)))
-     '(mouse ((t (:inherit zenburn-foreground))))
-     `(scroll-bar ((t (:background ,zenburn-bg+2))))
-     `(tool-bar ((t (:background ,zenburn-bg+2))))
-
-     '(ido-first-match ((t (:inherit zenburn-primary-1))))
-     '(ido-only-match ((t (:inherit zenburn-primary-2))))
-     `(ido-subdir ((t (:foreground ,zenburn-yellow))))
-
-     `(isearch ((t (:foreground ,zenburn-fg :background "#506070"))))
-     `(isearch-lazy-highlight
-       ((t (:foreground ,zenburn-fg :background "#1e2320" :weight normal))))
-
-     '(mtorus-highlight ((t (:inherit zenburn-highlight-bluish))))
-     '(mtorus-notify-highlight ((t (:inherit zenburn-primary-1))))
-
-     '(which-func ((t (:inherit mode-line))))
-
-     '(apt-utils-normal-package
-       ((t (:inherit zenburn-primary-1))))
-     '(apt-utils-virtual-package
-       ((t (:inherit zenburn-primary-2))))
-     '(apt-utils-field-keyword
-       ((t (:inherit font-lock-doc))))
-     '(apt-utils-field-contents
-       ((t (:inherit font-lock-comment))))
-     '(apt-utils-summary
-       ((t (:inherit bold))))
-     '(apt-utils-description
-       ((t (:inherit default))))
-     '(apt-utils-version
-       ((t (:inherit zenburn-blue))))
-     '(apt-utils-broken
-       ((t (:inherit font-lock-warning))))
-
-     '(breakpoint-enabled-bitmap ((t (:inherit zenburn-primary-1))))
-     '(breakpoint-disabled-bitmap ((t (:inherit font-lock-comment))))
-
-     '(calendar-today ((t (:underline nil :inherit zenburn-primary-2))))
-     '(diary ((t (:underline nil :inherit zenburn-primary-1))))
-     '(holiday ((t (:underline t :inherit zenburn-primary-4))))
-
-     '(bongo-unfilled-seek-bar ((t (:background "#606060"))))
-
-     '(change-log-date ((t (:inherit zenburn-blue))))
-
-     '(comint-highlight-input ((t (:inherit zenburn-primary-1))))
-     '(comint-highlight-prompt ((t (:inherit zenburn-primary-2))))
-
-     '(compilation-info ((t (:inherit zenburn-primary-1))))
-     '(compilation-warning ((t (:inherit font-lock-warning))))
-
-     ;; TODO
-     '(cua-rectangle ((t (:inherit region))))
-
-     '(custom-button
-       ((t (:inherit fancy-widget-button))))
-     '(custom-button-pressed
-       ((t (:inherit fancy-widget-button-pressed))))
-     '(custom-changed
-       ((t (:inherit zenburn-blue))))
-     '(custom-comment
-       ((t (:inherit font-lock-doc))))
-     '(custom-comment-tag
-       ((t (:inherit font-lock-doc))))
-     '(custom-documentation
-       ((t (:inherit font-lock-doc))))
-     '(custom-link
-       ((t (:inherit zenburn-yellow :underline t))))
-     '(custom-tag
-       ((t (:inherit zenburn-primary-2))))
-     '(custom-group-tag
-       ((t (:inherit zenburn-primary-1))))
-     '(custom-group-tag-1
-       ((t (:inherit zenburn-primary-4))))
-     '(custom-invalid
-       ((t (:inherit font-lock-warning))))
-     '(custom-modified
-       ((t (:inherit zenburn-primary-3))))
-     '(custom-rogue
-       ((t (:inhrit font-lock-warning))))
-     '(custom-saved
-       ((t (:underline t))))
-     '(custom-set
-       ((t (:inverse-video t :inherit zenburn-blue))))
-     '(custom-state
-       ((t (:inherit font-lock-comment))))
-     '(custom-variable-button
-       ((t (:weight bold :underline t))))
-     '(custom-variable-tag
-       ((t (:inherit zenburn-primary-2))))
-
-     '(dictionary-button ((t (:inherit fancy-widget-button))))
-     '(dictionary-reference ((t (:inherit zenburn-primary-1))))
-     '(dictionary-word-entry ((t (:inherit font-lock-keyword))))
-
-     '(diff-header ((t (:inherit zenburn-highlight-subtle))))
-     '(diff-index ((t (:inherit bold))))
-     '(diff-file-header ((t (:inherit bold))))
-     '(diff-hunk-header ((t (:inherit zenburn-highlight-subtle))))
-
-     '(diff-added ((t (:inherit zenburn-primary-3))))
-     '(diff-removed ((t (:inherit zenburn-blue))))
-     '(diff-context ((t (:inherit font-lock-comment))))
-
-     `(emms-pbi-song ((t (:foreground ,zenburn-yellow))))
-     '(emms-pbi-current ((t (:inherit zenburn-primary-1))))
-     '(emms-pbi-mark-marked ((t (:inherit zenburn-primary-2))))
-
-     '(erc-action ((t (:inherit erc-default))))
-     '(erc-bold ((t (:weight bold))))
-     '(erc-current-nick ((t (:inherit zenburn-primary-1))))
-     '(erc-dangerous-host ((t (:inherit font-lock-warning))))
-     `(erc-default ((t (:foreground ,zenburn-fg))))
-     '(erc-direct-msg ((t (:inherit erc-default))))
-     '(erc-error ((t (:inherit font-lock-warning))))
-     '(erc-fool ((t (:inherit zenburn-lowlight-1))))
-     '(erc-highlight ((t (:inherit hover-highlight))))
-     `(erc-input ((t (:foreground ,zenburn-yellow))))
-     '(erc-keyword ((t (:inherit zenburn-primary-1))))
-     '(erc-nick-default ((t (:inherit bold))))
-     '(erc-nick-msg ((t (:inherit erc-default))))
-     '(erc-notice ((t (:inherit zenburn-green))))
-     '(erc-pal ((t (:inherit zenburn-primary-3))))
-     '(erc-prompt ((t (:inherit zenburn-primary-2))))
-     '(erc-timestamp ((t (:inherit zenburn-green+1))))
-     '(erc-underline ((t (:inherit underline))))
-
-     '(circe-highlight-nick-face ((t (:inherit zenburn-primary-1))))
-     '(circe-my-message-face ((t (:inherit zenburn-yellow))))
-     '(circe-originator-face ((t (:inherit bold))))
-     '(circe-prompt-face ((t (:inherit zenburn-primary-1))))
-     '(circe-server-face ((t (:inherit font-lock-comment-face))))
-
-     '(rcirc-my-nick ((t (:inherit zenburn-primary-1))))
-     '(rcirc-other-nick ((t (:inherit bold))))
-     '(rcirc-bright-nick ((t (:foreground "white" :inherit rcirc-other-nick))))
-     '(rcirc-dim-nick ((t (:inherit font-lock-comment))))
-     '(rcirc-nick-in-message ((t (:inherit bold))))
-     '(rcirc-server ((t (:inherit font-lock-comment))))
-     '(rcirc-server-prefix ((t (:inherit font-lock-comment-delimiter))))
-     '(rcirc-timestamp ((t (:inherit font-lock-comment))))
-     '(rcirc-prompt ((t (:inherit zenburn-primary-1))))
-     '(rcirc-mode-line-nick ((t (:inherit zenburn-primary-1))))
-
-     '(eshell-prompt ((t (:inherit zenburn-primary-1))))
-     '(eshell-ls-archive ((t (:foreground "#c3bf9f" :weight bold))))
-     '(eshell-ls-backup ((t (:inherit font-lock-comment))))
-     '(eshell-ls-clutter ((t (:inherit font-lock-comment))))
-     `(eshell-ls-directory ((t (:foreground ,zenburn-blue+1 :weight bold))))
-     `(eshell-ls-executable ((t (:foreground ,zenburn-red+1 :weight bold))))
-     '(eshell-ls-unreadable ((t (:inherit zenburn-lowlight-1))))
-     '(eshell-ls-missing ((t (:inherit font-lock-warning))))
-     '(eshell-ls-product ((t (:inherit font-lock-doc))))
-     '(eshell-ls-special ((t (:inherit zenburn-primary-1))))
-     `(eshell-ls-symlink ((t (:foreground ,zenburn-cyan :weight bold))))
-
-     '(highlight-current-line ((t (:inherit zenburn-highlight-subtle))))
-
-     '(ibuffer-deletion ((t (:inherit zenburn-primary-2))))
-     '(ibuffer-marked ((t (:inherit zenburn-primary-1))))
-     '(ibuffer-special-buffer ((t (:inherit font-lock-doc))))
-     '(ibuffer-help-buffer ((t (:inherit font-lock-comment))))
-
-     '(message-cited-text ((t (:inherit font-lock-comment))))
-     ;;`(message-cited-text ((t (:foreground ,zenburn-blue))))
-     '(message-header-name ((t (:inherit zenburn-green+1))))
-     '(message-header-other ((t (:inherit zenburn-green))))
-     '(message-header-to ((t (:inherit zenburn-primary-1))))
-     '(message-header-from ((t (:inherit zenburn-primary-1))))
-     '(message-header-cc ((t (:inherit zenburn-primary-1))))
-     '(message-header-newsgroups ((t (:inherit zenburn-primary-1))))
-     '(message-header-subject ((t (:inherit zenburn-primary-2))))
-     '(message-header-xheader ((t (:inherit zenburn-green))))
-     '(message-mml ((t (:inherit zenburn-primary-1))))
-     '(message-separator ((t (:inherit font-lock-comment))))
-
-     '(gnus-header-name ((t (:inherit message-header-name))))
-     '(gnus-header-content ((t (:inherit message-header-other))))
-     '(gnus-header-from ((t (:inherit message-header-from))))
-     '(gnus-header-subject ((t (:inherit message-header-subject))))
-     '(gnus-header-newsgroups ((t (:inherit message-header-other))))
-
-     `(gnus-x-face ((t (:background ,zenburn-fg :foreground ,zenburn-bg))))
-
-     ;; (gnus-cite-1 ((t (:inherit message-cited-text))))
-     `(gnus-cite-1 ((t (:foreground ,zenburn-blue))))
-     `(gnus-cite-2 ((t (:foreground ,zenburn-blue-1))))
-     `(gnus-cite-3 ((t (:foreground ,zenburn-blue-2))))
-;;      (gnus-cite-4 ((t (:foreground ,zenburn-blue-3))))
-;;      (gnus-cite-5 ((t (:foreground ,zenburn-blue-4))))
-;;      (gnus-cite-6 ((t (:foreground ,zenburn-red-4))))
-;;      (gnus-cite-5 ((t (:foreground ,zenburn-red-3))))
-     `(gnus-cite-4 ((t (:foreground ,zenburn-green+2))))
-     `(gnus-cite-5 ((t (:foreground ,zenburn-green+1))))
-     `(gnus-cite-6 ((t (:foreground ,zenburn-green))))
-     `(gnus-cite-7 ((t (:foreground ,zenburn-red))))
-     `(gnus-cite-8 ((t (:foreground ,zenburn-red-1))))
-     `(gnus-cite-9 ((t (:foreground ,zenburn-red-2))))
-     `(gnus-cite-10 ((t (:foreground ,zenburn-yellow-1))))
-     `(gnus-cite-11 ((t (:foreground ,zenburn-yellow))))
-
-     `(gnus-group-news-1-empty ((t (:foreground ,zenburn-yellow))))
-     `(gnus-group-news-2-empty ((t (:foreground ,zenburn-green+3))))
-     `(gnus-group-news-3-empty ((t (:foreground ,zenburn-green+1))))
-     `(gnus-group-news-4-empty ((t (:foreground ,zenburn-blue-2)))) 
-     `(gnus-group-news-5-empty ((t (:foreground ,zenburn-blue-3))))
-     `(gnus-group-news-6-empty ((t (:inherit zenburn-lowlight-1))))
-     `(gnus-group-news-low-empty ((t (:inherit zenburn-lowlight-1))))
-
-     '(gnus-group-mail-1-empty ((t (:inherit gnus-group-news-1-empty))))
-     '(gnus-group-mail-2-empty ((t (:inherit gnus-group-news-2-empty))))
-     '(gnus-group-mail-3-empty ((t (:inherit gnus-group-news-3-empty))))
-     '(gnus-group-mail-4-empty ((t (:inherit gnus-group-news-4-empty))))
-     '(gnus-group-mail-5-empty ((t (:inherit gnus-group-news-5-empty))))
-     '(gnus-group-mail-6-empty ((t (:inherit gnus-group-news-6-empty))))
-     '(gnus-group-mail-low-empty ((t (:inherit gnus-group-news-low-empty))))
-
-     '(gnus-group-news-1 ((t (:bold t :inherit gnus-group-news-1-empty))))
-     '(gnus-group-news-2 ((t (:bold t :inherit gnus-group-news-2-empty))))
-     '(gnus-group-news-3 ((t (:bold t :inherit gnus-group-news-3-empty))))
-     '(gnus-group-news-4 ((t (:bold t :inherit gnus-group-news-4-empty))))
-     '(gnus-group-news-5 ((t (:bold t :inherit gnus-group-news-5-empty))))
-     '(gnus-group-news-6 ((t (:bold t :inherit gnus-group-news-6-empty))))
-     '(gnus-group-news-low ((t (:bold t :inherit gnus-group-news-low-empty))))
-
-     '(gnus-group-mail-1 ((t (:bold t :inherit gnus-group-mail-1-empty))))
-     '(gnus-group-mail-2 ((t (:bold t :inherit gnus-group-mail-2-empty))))
-     '(gnus-group-mail-3 ((t (:bold t :inherit gnus-group-mail-3-empty))))
-     '(gnus-group-mail-4 ((t (:bold t :inherit gnus-group-mail-4-empty))))
-     '(gnus-group-mail-5 ((t (:bold t :inherit gnus-group-mail-5-empty))))
-     '(gnus-group-mail-6 ((t (:bold t :inherit gnus-group-mail-6-empty))))
-     '(gnus-group-mail-low ((t (:bold t :inherit gnus-group-mail-low-empty))))
-
-     `(gnus-signature ((t (:foreground ,zenburn-yellow))))
-
-     '(gnus-summary-selected
-       ((t (:inherit zenburn-primary-1))))
-     '(gnus-summary-cancelled
-       ((t (:inherit zenburn-highlight-alerting))))
-
-     '(gnus-summary-low-ticked
-       ((t (:inherit zenburn-primary-2))))
-     '(gnus-summary-normal-ticked
-       ((t (:inherit zenburn-primary-2))))
-     '(gnus-summary-high-ticked
-       ((t (:inherit zenburn-primary-2))))
-
-     '(gnus-summary-low-unread
-       ((t (:inherit zenburn-foreground :weight normal))))
-     '(gnus-summary-normal-unread
-       ((t (:inherit zenburn-foreground :weight normal))))
-     '(gnus-summary-high-unread
-       ((t (:inherit zenburn-foreground :weight bold))))
-
-     '(gnus-summary-low-read
-       ((t (:inherit zenburn-green :weight normal))))
-     '(gnus-summary-normal-read
-       ((t (:inherit zenburn-green :weight normal))))
-     '(gnus-summary-high-read
-       ((t (:inherit zenburn-green :weight bold))))
-
-     '(gnus-summary-low-ancient
-       ((t (:inherit zenburn-blue :weight normal))))
-     '(gnus-summary-normal-ancient
-       ((t (:inherit zenburn-blue :weight normal))))
-     '(gnus-summary-high-ancient
-       ((t (:inherit zenburn-blue))))
-
-     '(help-argument-name ((t (:weight bold))))
-
-     ;; See also the variable definitions at the top of this file
-     '(imaxima-latex-error ((t (:inherit font-lock-warning))))
-
-     `(info-xref ((t (:foreground ,zenburn-yellow :weight bold))))
-     '(info-xref-visited ((t (:inherit info-xref :weight normal))))
-     '(info-header-xref ((t (:inherit info-xref))))
-     `(info-menu-star ((t (:foreground ,zenburn-orange :weight bold))))
-     `(info-menu-5 ((t (:inherit info-menu-star))))
-     '(info-node ((t (:weight bold))))
-     '(info-header-node ((t (:weight normal))))
-
-     '(jabber-roster-user-chatty
-       ((t (:inherit zenburn-primary-1))))
-     '(jabber-roster-user-online
-       ((t (:inherit zenburn-primary-2))))
-     '(jabber-roster-user-away
-       ((t (:inherit font-lock-doc))))
-     '(jabber-roster-user-xa
-       ((t (:inherit font-lock-comment))))
-     '(jabber-roster-user-offline
-       ((t (:inherit zenburn-lowlight-1))))
-     '(jabber-roster-user-dnd
-       ((t (:inherit zenburn-primary-5))))
-     '(jabber-roster-user-error
-       ((t (:inherit font-lock-warning))))
-
-     '(jabber-title-small
-       ((t (:inherit zenburn-title :height 1.2))))
-     '(jabber-title-medium
-       ((t (:inherit jabber-title-small :height 1.2))))
-     '(jabber-title-large
-       ((t (:inherit jabber-title-medium :height 1.2))))
-
-     '(jabber-chat-prompt-local
-       ((t (:inherit zenburn-primary-1))))
-     '(jabber-chat-prompt-foreign
-       ((t (:inherit zenburn-primary-2))))
-
-     '(jabber-rare-time-face
-       ((t (:inherit zenburn-green+1))))
-
-     '(jde-java-font-lock-modifier
-       ((t (:inherit zenburn-primary-2))))
-     '(jde-java-font-lock-doc-tag
-       ((t (:inherit zenburn-primary-1))))
-     '(jde-java-font-lock-constant
-       ((t (:inherit font-lock-constant))))
-     '(jde-java-font-lock-package
-       ((t (:inherit zenburn-primary-3))))
-     '(jde-java-font-lock-number
-       ((t (:inherit font-lock-constant))))
-     '(jde-java-font-lock-operator
-       ((t (:inherit font-lock-keyword))))
-     '(jde-java-font-lock-link
-       ((t (:inherit zenburn-primary-5 :underline t))))
-
-     '(keywiz-right ((t (:inherit zenburn-primary-1))))
-     '(keywiz-wrong ((t (:inherit font-lock-warning))))
-     '(keywiz-command ((t (:inherit zenburn-primary-2))))
-
-     '(font-latex-bold ((t (:inherit bold))))
-     '(font-latex-warning ((t (:inherit font-lock-warning))))
-     '(font-latex-sedate ((t (:inherit zenburn-primary-1))))
-     '(font-latex-title-4 ((t (:inherit zenburn-title))))
-
-     '(makefile-space ((t (:inherit font-lock-warning))))
-     '(makefile-shell ((t (nil))))
-     ;; This does not work very well because everything that's highlighted
-     ;; inside the shell region will get its own box.
-     ;; (makefile-shell ((t (:background "#4f4f4f"
-     ;;                           :box (:line-width 2 :color "#4f4f4f")))))
-
-     '(nxml-delimited-data ((t (:inherit font-lock-string))))
-     '(nxml-name ((t (:inherit zenburn-primary-1))))
-     '(nxml-ref ((t (:inherit zenburn-primary-5))))
-     '(nxml-delimiter ((t (:inherit default))))
-     '(nxml-text ((t (:inherit default))))
-
-     '(nxml-comment-content
-       ((t (:inherit font-lock-comment))))
-     '(nxml-comment-delimiter
-       ((t (:inherit nxml-comment-content))))
-     '(nxml-processing-instruction-target
-       ((t (:inherit zenburn-primary-2))))
-     '(nxml-processing-instruction-delimiter
-       ((t (:inherit nxml-processing-instruction-target))))
-     '(nxml-processing-instruction-content
-       ((t (:inherit nxml-processing-instruction-target))))
-     '(nxml-cdata-section-CDATA
-       ((t (:inherit zenburn-primary-4))))
-     '(nxml-cdata-section-delimiter
-       ((t (:inherit nxml-cdata-section-CDATA))))
-     '(nxml-cdata-section-content
-       ((t (:inherit nxml-text))))
-     '(nxml-entity-ref-name
-       ((t (:inherit zenburn-primary-5))))
-     '(nxml-entity-ref-delimiter
-       ((t (:inherit nxml-entity-ref-name))))
-     '(nxml-char-ref-number
-       ((t (:inherit nxml-entity-ref-name))))
-     '(nxml-char-ref-delimiter
-       ((t (:inherit nxml-entity-ref-delimiter))))
-
-     '(nxml-tag-delimiter ((t (:inherit default))))
-     '(nxml-tag-slash ((t (:inherit default))))
-     '(nxml-element-local-name ((t (:inherit zenburn-primary-1))))
-     '(nxml-element-prefix ((t (:inherit default))))
-     '(nxml-element-colon ((t (:inherit default))))
-
-     '(nxml-attribute-local-name
-       ((t (:inherit zenburn-primary-3))))
-     '(nxml-namespace-attribute-prefix
-       ((t (:inherit nxml-attribute-local-name))))
-     '(nxml-attribute-value
-       ((t (:inherit font-lock-string))))
-     '(nxml-attribute-value-delimiter
-       ((t (:inherit nxml-attribute-value))))
-     '(nxml-attribute-prefix
-       ((t (:inherit default))))
-     '(nxml-namespace-attribute-xmlns
-       ((t (:inherit nxml-attribute-prefix))))
-     '(nxml-attribute-colon
-       ((t (:inherit default))))
-     '(nxml-namespace-attribute-colon
-       ((t (:inherit nxml-attribute-colon))))
-
-     '(org-agenda-date-today ((t (:foreground "white" 
-                               :slant italic :weight bold))) t)       ;; white
-     '(org-agenda-structure ((t (:inherit font-lock-comment-face))))  ;; zenburn-green
-     '(org-archived ((t (:foreground "#8f8f8f"))))                    ;; zenburn-bg slight lighter
-     '(org-column ((t (:height 98 :family "DejaVu Sans Mono"))))      ;; n/a
-     '(org-checkbox ((t (:background "#5f5f5f" :foreground "white"    ;; zenburn-fg on zenburn-bg+2
-                      :box (:line-width 1 :style released-button))))) ;;   - turn checkboxes into buttons
-     '(org-date ((t (:foreground "#8cd0d3" :underline t))))           ;; zenburn-blue
-     '(org-deadline-announce ((t (:foreground "#bc8383"))))           ;; zenburn-red-1
-     '(org-done ((t (:bold t :weight bold :foreground "#afd8af"))))   ;; zenburn-green+3
-     '(org-formula ((t (:foreground "#d0bf8f"))))                     ;; zenburn-yellow-2
-     '(org-headline-done ((t (:foreground "#afd8af"))))               ;; zenburn-green+3
-     '(org-hide ((t (:foreground "#282828"))))                        ;; zenburn-bg slight darker
-     '(org-level-1 ((t (:foreground "#dfaf8f"))))                     ;; zenburn-orange
-     '(org-level-2 ((t (:foreground "#f0dfaf"))))                     ;; zenburn-yellow
-     '(org-level-3 ((t (:foreground "#8cd0d3"))))                     ;; zenburn-blue
-     '(org-level-4 ((t (:foreground "#93e0e3"))))                     ;; zenburn-cyan
-     '(org-level-5 ((t (:foreground "#7cb8bb"))))                     ;; zenburn-blue-1
-     '(org-level-6 ((t (:foreground "#6ca0a3"))))                     ;; zenburn-blue-2
-     '(org-level-7 ((t (:foreground "#5c888b"))))                     ;; zenburn-blue-3
-     '(org-level-8 ((t (:foreground "#4c7073"))))                     ;; zenburn-blue-4
-     '(org-link ((t (:foreground "#d0bf8f" :underline t))))           ;; zenburn-yellow-2
-     ;'(org-priority faces                                            TODO
-     '(org-scheduled ((t (:foreground "#bfebbf"))))                   ;; zenburn-green+4
-     '(org-scheduled-previously ((t (:foreground "#8c5353"))))        ;; zenburn-red-4
-     '(org-scheduled-today ((t (:foreground "#94bff3"))))             ;; zenburn-blue+1
-     '(org-special-keyword ((t (:foreground "#e0cf9f"))))             ;; zenburn-yellow-1
-     '(org-table ((t (:foreground "#9fc59f"))))                       ;; zenburn-green+2
-     '(org-tag ((t (:bold t :weight bold))))                          ;; n/a
-     '(org-time-grid ((t (:foreground "#ffc9a4"))))                   ;; zenburn-orange slight lighter
-     '(org-todo ((t (:bold t :foreground "#cc9393" :weight bold))))   ;; zenburn-red
-     '(org-upcoming-deadline ((t (:inherit font-lock-keyword-face)))) ;; zenburn-fg
-     '(org-warning ((t (:bold t :foreground "#cc9393" :weight bold))));; zenburn-red
-
-     ;; TODO
-     '(outline-8 ((t (:inherit default))))
-     '(outline-7 ((t (:inherit outline-8 :height 1.0))))
-     '(outline-6 ((t (:inherit outline-7 :height 1.0))))
-     '(outline-5 ((t (:inherit outline-6 :height 1.0))))
-     '(outline-4 ((t (:inherit outline-5 :height 1.0))))
-     '(outline-3 ((t (:inherit outline-4 :height 1.0))))
-     '(outline-2 ((t (:inherit outline-3 :height 1.0))))
-     '(outline-1 ((t (:inherit outline-2 :height 1.0))))
-
-     '(setnu-line-number ((t (:inherit zenburn-lowlight-2))))
-
-     '(speedbar-button ((t (:inherit zenburn-primary-1))))
-     '(speedbar-file ((t (:inherit zenburn-primary-2))))
-     '(speedbar-directory ((t (:inherit zenburn-primary-5))))
-     '(speedbar-tag ((t (:inherit font-lock-function-name))))
-     '(speedbar-highlight ((t (:underline t))))
-
-     '(strokes-char ((t (:inherit font-lock-keyword))))
-
-     '(todoo-item-header
-       ((t (:inherit zenburn-primary-1))))
-     '(todoo-item-assigned-header
-       ((t (:inherit zenburn-primary-2))))
-     `(todoo-sub-item-header
-       ((t (:foreground ,zenburn-yellow))))
-
-     '(tuareg-font-lock-governing
-       ((t (:inherit zenburn-primary-2))))
-     '(tuareg-font-lock-interactive-error
-       ((t (:inherit font-lock-warning))))
-     '(tuareg-font-lock-interactive-output
-       ((t (:inherit zenburn-primary-3))))
-     '(tuareg-font-lock-operator
-       ((t (:inherit font-lock-operator))))
-
-     '(w3m-form-button
-       ((t (:inherit widget-button))))
-     '(w3m-form-button-pressed
-       ((t (:inherit widget-button-pressed))))
-     '(w3m-form-button-mouse
-       ((t (:inherit widget-button-pressed))))
-     '(w3m-tab-unselected
-       ((t (:box (:line-width 1 :style released-button)))))
-     '(w3m-tab-selected
-       ((t (:box (:line-width 1 :style pressed-button)))))
-     '(w3m-tab-unselected-retrieving
-       ((t (:inherit (w3m-tab-unselected widget-inactive)))))
-     '(w3m-tab-selected-retrieving
-       ((t (:inherit (w3m-tab-selected widget-inactive)))))
-     '(w3m-tab-background
-       ((t (:inherit zenburn-highlight-subtle))))
-     '(w3m-anchor
-       ((t (:inherit zenburn-primary-1))))
-     '(w3m-arrived-anchor
-       ((t (:inherit zenburn-primary-2))))
-     '(w3m-image
-       ((t (:inherit zenburn-primary-4))))
-     '(w3m-form
-       ((t (:inherit widget-field)))))
-
-    (zenburn-make-face-alias-clauses
-     '(Buffer-menu-buffer-face
-       apt-utils-broken-face
-       apt-utils-description-face
-       apt-utils-field-contents-face
-       apt-utils-field-keyword-face
-       apt-utils-normal-package-face
-       apt-utils-summary-face
-       apt-utils-version-face
-       apt-utils-virtual-package-face
-       breakpoint-disabled-bitmap-face
-       breakpoint-enabled-bitmap-face
-       calendar-today-face
-       change-log-date-face
-       compilation-info-face
-       compilation-warning-face
-       cua-rectangle-face
-       custom-button-face
-       custom-button-pressed-face
-       custom-changed-face
-       custom-comment-face
-       custom-comment-tag-face
-       custom-documentation-face
-       custom-face-tag-face
-       custom-group-tag-face
-       custom-group-tag-face-1
-       custom-invalid-face
-       custom-modified-face
-       custom-rogue-face
-       custom-saved-face
-       custom-set-face
-       custom-state-face
-       custom-variable-button-face
-       custom-variable-tag-face
-       diary-face
-       dictionary-button-face
-       dictionary-reference-face
-       dictionary-word-entry-face
-       diff-added-face
-       diff-context-face
-       diff-file-header-face
-       diff-header-face
-       diff-hunk-header-face
-       diff-index-face
-       diff-removed-face
-       emms-pbi-current-face
-       emms-pbi-mark-marked-face
-       emms-pbi-song-face
-       erc-action-face
-       erc-bold-face
-       erc-current-nick-face
-       erc-dangerous-host-face
-       erc-default-face
-       erc-direct-msg-face
-       erc-error-face
-       erc-fool-face
-       erc-highlight-face
-       erc-input-face
-       erc-keyword-face
-       erc-nick-default-face
-       erc-nick-msg-face
-       erc-notice-face
-       erc-pal-face
-       erc-prompt-face
-       erc-timestamp-face
-       erc-underline-face
-       eshell-ls-archive-face
-       eshell-ls-backup-face
-       eshell-ls-clutter-face
-       eshell-ls-directory-face
-       eshell-ls-executable-face
-       eshell-ls-missing-face
-       eshell-ls-product-face
-       eshell-ls-special-face
-       eshell-ls-symlink-face
-       eshell-ls-unreadable-face
-       eshell-prompt-face
-       fancy-widget-button-face
-       fancy-widget-button-highlight-face
-       fancy-widget-button-pressed-face
-       fancy-widget-button-pressed-highlight-face
-       fancy-widget-documentation-face
-       fancy-widget-field-face
-       fancy-widget-inactive-face
-       fancy-widget-single-line-field-face
-       font-latex-bold-face
-       font-latex-sedate-face
-       font-latex-title-4-face
-       font-latex-warning-face
-       font-lock-builtin-face
-       font-lock-comment-delimiter-face
-       font-lock-comment-face
-       font-lock-constant-face
-       font-lock-doc-face
-       font-lock-function-name-face
-       font-lock-keyword-face
-       font-lock-negation-char-face
-       font-lock-operator-face
-       font-lock-preprocessor-face
-       font-lock-pseudo-keyword-face
-       font-lock-string-face
-       font-lock-type-face
-       font-lock-variable-name-face
-       font-lock-warning-face
-       gnus-cite-face-1
-       gnus-cite-face-10
-       gnus-cite-face-11
-       gnus-cite-face-2
-       gnus-cite-face-3
-       gnus-cite-face-4
-       gnus-cite-face-5
-       gnus-cite-face-6
-       gnus-cite-face-7
-       gnus-cite-face-8
-       gnus-cite-face-9
-       gnus-group-mail-1-empty-face
-       gnus-group-mail-2-empty-face
-       gnus-group-mail-3-empty-face
-       gnus-group-mail-3-face
-       gnus-group-news-1-empty-face
-       gnus-group-news-2-empty-face
-       gnus-group-news-3-empty-face
-       gnus-header-content-face
-       gnus-header-from-face
-       gnus-header-name-face
-       gnus-header-newsgroups-face
-       gnus-header-subject-face
-       gnus-signature-face
-       gnus-summary-cancelled-face
-       gnus-summary-high-ancient-face
-       gnus-summary-high-read-face
-       gnus-summary-high-ticked-face
-       gnus-summary-high-unread-face
-       gnus-summary-low-ancient-face
-       gnus-summary-low-read-face
-       gnus-summary-low-ticked-face
-       gnus-summary-low-unread-face
-       gnus-summary-normal-ancient-face
-       gnus-summary-normal-read-face
-       gnus-summary-normal-ticked-face
-       gnus-summary-normal-unread-face
-       gnus-summary-selected-face
-       highlight-current-line-face
-       holiday-face
-       ibuffer-deletion-face
-       ibuffer-help-buffer-face
-       ibuffer-marked-face
-       ibuffer-special-buffer-face
-       ido-first-match-face
-       ido-only-match-face
-       ido-subdir-face
-       imaxima-latex-error-face
-       isearch-lazy-highlight-face
-       jde-java-font-lock-constant-face
-       jde-java-font-lock-doc-tag-face
-       jde-java-font-lock-link-face
-       jde-java-font-lock-modifier-face
-       jde-java-font-lock-number-face
-       jde-java-font-lock-operator-face
-       jde-java-font-lock-package-face
-       keywiz-command-face
-       keywiz-right-face
-       keywiz-wrong-face
-       makefile-shell-face
-       makefile-space-face
-       message-cited-text-face
-       message-header-cc-face
-       message-header-from-face
-       message-header-name-face
-       message-header-newsgroups-face
-       message-header-other-face
-       message-header-subject-face
-       message-header-to-face
-       message-header-xheader-face
-       message-mml-face
-       message-separator-face
-       mtorus-highlight-face
-       mtorus-notify-highlight-face
-       nxml-attribute-colon-face
-       nxml-attribute-local-name-face
-       nxml-attribute-prefix-face
-       nxml-attribute-value-delimiter-face
-       nxml-attribute-value-face
-       nxml-cdata-section-CDATA-face
-       nxml-cdata-section-content-face
-       nxml-cdata-section-delimiter-face
-       nxml-char-ref-delimiter-face
-       nxml-char-ref-number-face
-       nxml-comment-content-face
-       nxml-comment-delimiter-face
-       nxml-delimited-data-face
-       nxml-delimiter-face
-       nxml-element-colon-face
-       nxml-element-local-name-face
-       nxml-element-prefix-face
-       nxml-entity-ref-delimiter-face
-       nxml-entity-ref-name-face
-       nxml-name-face
-       nxml-namespace-attribute-colon-face
-       nxml-namespace-attribute-prefix-face
-       nxml-namespace-attribute-xmlns-face
-       nxml-processing-instruction-content-face
-       nxml-processing-instruction-delimiter-face
-       nxml-processing-instruction-target-face
-       nxml-ref-face
-       nxml-tag-delimiter-face
-       nxml-tag-slash-face
-       nxml-text-face
-       org-agenda-date-today-face
-       org-agenda-structure-face
-       org-archived-face
-       org-column-face
-       ;org-checkbox-face
-       org-date-face
-       org-deadline-announce-face
-       org-done-face
-       org-formula-face
-       org-headline-done-face
-       org-hide-face
-       org-level-1-face
-       org-level-2-face
-       org-level-3-face
-       org-level-4-face
-       org-level-5-face
-       org-level-6-face
-       org-level-7-face
-       org-level-8-face
-       org-link-face
-       ;org-priority-face
-       org-scheduled-face
-       org-scheduled-previously-face
-       org-scheduled-today-face
-       org-special-keyword-face
-       org-table-face
-       org-tag-face
-       org-time-grid-face
-       org-todo-face
-       org-upcoming-deadline-face
-       org-warning-face
-       paren-face
-       plain-widget-button-face
-       plain-widget-button-pressed-face
-       plain-widget-documentation-face
-       plain-widget-field-face
-       plain-widget-inactive-face
-       plain-widget-single-line-field-face
-       setnu-line-number-face
-       show-paren-match-face
-       show-paren-mismatch-face
-       speedbar-button-face
-       speedbar-directory-face
-       speedbar-file-face
-       speedbar-highlight-face
-       speedbar-tag-face
-       strokes-char-face
-       todoo-item-assigned-header-face
-       todoo-item-header-face
-       todoo-sub-item-header-face
-       tuareg-font-lock-governing-face
-       tuareg-font-lock-interactive-error-face
-       tuareg-font-lock-interactive-output-face
-       tuareg-font-lock-operator-face
-       w3m-anchor-face
-       w3m-arrived-anchor-face
-       w3m-form-button-face
-       w3m-form-button-mouse-face
-       w3m-form-button-pressed-face
-       w3m-form-face
-       w3m-image-face
-       w3m-tab-background-face
-       w3m-tab-selected-face
-       w3m-tab-selected-retrieving-face
-       w3m-tab-unselected-face
-       w3m-tab-unselected-retrieving-face
-       widget-button-face
-       widget-button-highlight-face
-       widget-button-pressed-face
-       widget-button-pressed-highlight-face
-       widget-documentation-face
-       widget-field-face
-       widget-inactive-face
-       widget-single-line-field-face))
-    )))
-
-(defalias 'zenburn #'color-theme-zenburn)
-
-(provide 'zenburn)
-
-;; Local Variables:
-;; time-stamp-format: "%:y-%02m-%02d %02H:%02M"
-;; time-stamp-start: "Updated: "
-;; time-stamp-end: "$"
-;; End:
-
-;;; zenburn.el ends here.
diff --git a/.gitignore b/.gitignore
index 0000362..c531d98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1 @@
-*~
-*session.*
-*\#*
-.emacs.d/ac-comphist.dat
-local_*
 *.elc
-rc2.lua
diff --git a/README b/README
deleted file mode 100644
index 538f3d5..0000000
--- a/README
+++ /dev/null
@@ -1,7 +0,0 @@
-To use these settings you need:
-   * Pyflakes
-
-To install this in Ubuntu use:
-   sudo apt-get install pyflakes
-To install this in Fedora use:
-   su -c "yum install pyflakes"
\ No newline at end of file
diff --git a/dotawesome/.gitignore b/dotawesome/.gitignore
deleted file mode 100644
index b25c15b..0000000
--- a/dotawesome/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*~
diff --git a/dotawesome/rc.lua b/dotawesome/rc.lua
deleted file mode 100644
index de0902b..0000000
--- a/dotawesome/rc.lua
+++ /dev/null
@@ -1,454 +0,0 @@
--- Standard awesome library
-require("awful")
-require("awful.autofocus")
-require("awful.rules")
--- Theme handling library
-require("beautiful")
--- Notification library
-require("naughty")
---require("vicious")
--- {{{ Variable definitions
--- Themes define colours, icons, and wallpapers
-beautiful.init(os.getenv("HOME") .. "/.config/awesome/themes/default/theme.lua")
-
--- Functions
-function switch_tag (i)
-   local screen = mouse.screen
-   if tags[screen][i] then
-      awful.tag.viewonly(tags[screen][i])
-   end
-end
-
-function toggle_tag (i)
-   local screen = mouse.screen
-   if tags[screen][i] then
-      awful.tag.viewtoggle(tags[screen][i])
-   end
-end
-
-function move_to_tag (i)
-   if client.focus and tags[client.focus.screen][i] then
-      awful.client.movetotag(tags[client.focus.screen][i])
-   end
-end
-
-function toggle_client_tag (i)
-   if client.focus and tags[client.focus.screen][i] then
-      awful.client.toggletag(tags[client.focus.screen][i])
-   end
-end
-
-function fexists(n)
-   local f = io.open(n)
-
-   print(f)
-   print(f == nil)
-   
-   if f == nil then
-      print("returning false")
-      return false
-   end
-
-   print("returning true")
-   io.close(f)
-   return true
-end
-
--- This is used later as the default terminal and editor to run.
-terminal = "urxvt"
-editor = "emacs"
-editor_cmd = editor
-locker = "i3lock -c 000000"
-
--- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
--- If you do not like this or do not have such a key,
--- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
-modkey = "Mod4"
-
--- Table of layouts to cover with awful.layout.inc, order matters.
-layouts =
-{
-    awful.layout.suit.tile,
-    awful.layout.suit.tile.left,
-    awful.layout.suit.tile.bottom,
-    awful.layout.suit.tile.top,
-    awful.layout.suit.fair,
-    awful.layout.suit.fair.horizontal,
-    awful.layout.suit.spiral,
-    awful.layout.suit.spiral.dwindle,
-    awful.layout.suit.max,
-    awful.layout.suit.max.fullscreen,
-    awful.layout.suit.magnifier,
-    awful.layout.suit.floating
-}
--- }}}
-
--- {{{ Tags
--- Define a tag table which hold all screen tags.
-tags = {}
-for s = 1, screen.count() do
-    -- Each screen has its own tag table.
-    tags[s] = awful.tag({ "Q", "W", "E", "A", "S", "D", "Z", "X", "C" }, s, layouts[1])
-end
--- }}}
-
--- {{{ Menu
--- Create a laucher widget and a main menu
-myawesomemenu = {
-   { "manual", terminal .. " -e man awesome" },
-   { "edit config", editor_cmd .. " " .. awful.util.getdir("config") .. "/rc.lua" },
-   { "restart", awesome.restart },
-   { "quit", awesome.quit }
-}
-
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "open terminal", terminal }
-                                  }
-                        })
-
-mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon),
-                                     menu = mymainmenu })
--- }}}
-
--- {{{ Wibox
--- Create a textclock widget
-mytextclock = awful.widget.textclock({ align = "right" })
-
--- Create Network usage widget
---netwidget = widget({ type = "textbox" })
---vicious.register(netwidget, vicious.net, "down:${eth0 down_kb} up:${eth0 up_kb}")
-
--- Create a systray
-mysystray = widget({ type = "systray" })
-
--- Create a wibox for each screen and add it
-mywibox = {}
-mypromptbox = {}
-mylayoutbox = {}
-mytaglist = {}
-mytaglist.buttons = awful.util.table.join(
-                    awful.button({ }, 1, awful.tag.viewonly),
-                    awful.button({ modkey }, 1, awful.client.movetotag),
-                    awful.button({ }, 3, awful.tag.viewtoggle),
-                    awful.button({ modkey }, 3, awful.client.toggletag),
-                    awful.button({ }, 4, awful.tag.viewnext),
-                    awful.button({ }, 5, awful.tag.viewprev)
-                    )
-mytasklist = {}
-mytasklist.buttons = awful.util.table.join(
-                     awful.button({ }, 1, function (c)
-                                              if not c:isvisible() then
-                                                  awful.tag.viewonly(c:tags()[1])
-                                              end
-                                              client.focus = c
-                                              c:raise()
-                                          end),
-                     awful.button({ }, 3, function ()
-                                              if instance then
-                                                  instance:hide()
-                                                  instance = nil
-                                              else
-                                                  instance = awful.menu.clients({ width=250 })
-                                              end
-                                          end),
-                     awful.button({ }, 4, function ()
-                                              awful.client.focus.byidx(1)
-                                              if client.focus then client.focus:raise() end
-                                          end),
-                     awful.button({ }, 5, function ()
-                                              awful.client.focus.byidx(-1)
-                                              if client.focus then client.focus:raise() end
-                                          end))
-xmms2_playing = false
--- Create a previous button
-myprevbutton = widget({ type = "imagebox" })
-myprevbutton.image = image(beautiful.xmms2_previous_icon)
-myprevbutton:buttons(awful.util.table.join(
-                        awful.button({ }, 1,
-                                     function ()
-                                        awful.util.spawn("xmms2 prev")
-                                     end)
-                  ))
--- Create a play button
-myplaybutton = widget({ type = "imagebox" })
-myplaybutton.image = image(beautiful.xmms2_play_icon)
-myplaybutton:buttons(awful.util.table.join(
-                        awful.button({ }, 1,
-                                     function ()
-                                        awful.util.spawn("xmms2 toggleplay")
-                                        if xmms2_playing then xmms2_playing = false else xmms2_playing = true end
-                                        if xmms2_playing then
-                                           myplaybutton.image = image(beautiful.xmms2_pause_icon)
-                                        else
-                                           myplaybutton.image = image(beautiful.xmms2_play_icon)
-                                        end
-                                     end)
-                  ))
--- Create a stop button
-mystopbutton = widget({ type = "imagebox" })
-mystopbutton.image = image(beautiful.xmms2_stop_icon)
-mystopbutton:buttons(awful.util.table.join(
-                        awful.button({ }, 1,
-                                     function ()
-                                        if xmms2_playing then
-                                           xmms2_playing = false
-                                           myplaybutton.image = image(beautiful.xmms2_play_icon)
-                                        end
-                                        awful.util.spawn("xmms2 stop")
-                                     end)
-                  ))
--- Create a next button
-mynextbutton = widget({ type = "imagebox" })
-mynextbutton.image = image(beautiful.xmms2_next_icon)
-mynextbutton:buttons(awful.util.table.join(
-                        awful.button({ }, 1,
-                                     function ()
-                                        awful.util.spawn("xmms2 next")
-                                     end)
-                  ))
-
-for s = 1, screen.count() do
-    -- Create a promptbox for each screen
-    mypromptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright })
-    -- Create an imagebox widget which will contains an icon indicating which layout we're using.
-    -- We need one layoutbox per screen.
-    mylayoutbox[s] = awful.widget.layoutbox(s)
-    mylayoutbox[s]:buttons(awful.util.table.join(
-                           awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
-                           awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end),
-                           awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
-                           awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
-    -- Create a taglist widget
-    mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.label.all, mytaglist.buttons)
-
-    -- Create a tasklist widget
-    mytasklist[s] = awful.widget.tasklist(function(c)
-                                              return awful.widget.tasklist.label.currenttags(c, s)
-                                          end, mytasklist.buttons)
-
-    -- Create the wibox
-    mywibox[s] = awful.wibox({ position = "top", screen = s })
-    -- Add widgets to the wibox - order matters
-    mywibox[s].widgets = {
-        {
-            mylauncher,
-            mytaglist[s],
-            mypromptbox[s],
-            layout = awful.widget.layout.horizontal.leftright
-        },
-        mylayoutbox[s],
-        mynextbutton,
-        mystopbutton,
-        myplaybutton,
-        myprevbutton,
-        mytextclock,
-        s == 1 and mysystray or nil,
-        mytasklist[s],
-        layout = awful.widget.layout.horizontal.rightleft
-    }
-end
--- }}}
-
--- {{{ Mouse bindings
-root.buttons(awful.util.table.join(
-    awful.button({ }, 3, function () mymainmenu:toggle() end),
-    awful.button({ }, 4, awful.tag.viewnext),
-    awful.button({ }, 5, awful.tag.viewprev)
-))
--- }}}
-
--- {{{ Key bindings
-globalkeys = awful.util.table.join(
-    awful.key({ modkey,                    }, "Left",   awful.tag.viewprev       ),
-    awful.key({ modkey,                    }, "Right",  awful.tag.viewnext       ),
-    awful.key({ modkey,                    }, "Escape", awful.tag.history.restore),
-
-    awful.key({ modkey,                    }, "j",
-        function ()
-            awful.client.focus.byidx( 1)
-            if client.focus then client.focus:raise() end
-        end),
-    awful.key({ modkey,                    }, "k",
-        function ()
-            awful.client.focus.byidx(-1)
-            if client.focus then client.focus:raise() end
-        end),
-    awful.key({ modkey, "Mod1"             }, "w", function () mymainmenu:show(true)        end),
-
-    -- Layout manipulation
-    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end),
-    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end),
-    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end),
-    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
-    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto),
-    awful.key({ modkey,           }, "Tab",
-        function ()
-            awful.client.focus.history.previous()
-            if client.focus then
-                client.focus:raise()
-            end
-        end),
-
-    -- Standard program
-    awful.key({ modkey,                    }, "Return", function () awful.util.spawn(terminal) end),
-    awful.key({ modkey, "Control"          }, "r", awesome.restart),
-    awful.key({ modkey, "Mod1"             }, "q", awesome.quit),
-    awful.key({ "Mod1", "Control"          }, "l", function () awful.util.spawn(locker) end),
-
-    awful.key({ modkey,                    }, "l",     function () awful.tag.incmwfact( 0.05)    end),
-    awful.key({ modkey,                    }, "h",     function () awful.tag.incmwfact(-0.05)    end),
-    awful.key({ modkey, "Shift"            }, "h",     function () awful.tag.incnmaster( 1)      end),
-    awful.key({ modkey, "Shift"            }, "l",     function () awful.tag.incnmaster(-1)      end),
-    awful.key({ modkey, "Control"          }, "h",     function () awful.tag.incncol( 1)         end),
-    awful.key({ modkey, "Control"          }, "l",     function () awful.tag.incncol(-1)         end),
-    awful.key({ modkey,                    }, "space", function () awful.layout.inc(layouts,  1) end),
-    awful.key({ modkey, "Shift"            }, "space", function () awful.layout.inc(layouts, -1) end),
-
-    -- Extra tag bindings
-    awful.key({ modkey,                    }, "q", function () switch_tag(1)        end),
-    awful.key({ modkey,                    }, "w", function () switch_tag(2)        end),
-    awful.key({ modkey,                    }, "e", function () switch_tag(3)        end),
-    awful.key({ modkey,                    }, "a", function () switch_tag(4)        end),
-    awful.key({ modkey,                    }, "s", function () switch_tag(5)        end),
-    awful.key({ modkey,                    }, "d", function () switch_tag(6)        end),
-    awful.key({ modkey,                    }, "z", function () switch_tag(7)        end),
-    awful.key({ modkey,                    }, "x", function () switch_tag(8)        end),
-    awful.key({ modkey,                    }, "c", function () switch_tag(9)        end),
-
-    awful.key({ modkey, "Control"          }, "q", function () toggle_tag(1)        end),
-    awful.key({ modkey, "Control"          }, "w", function () toggle_tag(2)        end),
-    awful.key({ modkey, "Control"          }, "e", function () toggle_tag(3)        end),
-    awful.key({ modkey, "Control"          }, "a", function () toggle_tag(4)        end),
-    awful.key({ modkey, "Control"          }, "s", function () toggle_tag(5)        end),
-    awful.key({ modkey, "Control"          }, "d", function () toggle_tag(6)        end),
-    awful.key({ modkey, "Control"          }, "z", function () toggle_tag(7)        end),
-    awful.key({ modkey, "Control"          }, "x", function () toggle_tag(8)        end),
-    awful.key({ modkey, "Control"          }, "c", function () toggle_tag(9)        end),
-
-    awful.key({ modkey, "Shift"            }, "q", function () move_to_tag(1)       end),
-    awful.key({ modkey, "Shift"            }, "w", function () move_to_tag(2)       end),
-    awful.key({ modkey, "Shift"            }, "e", function () move_to_tag(3)       end),
-    awful.key({ modkey, "Shift"            }, "a", function () move_to_tag(4)       end),
-    awful.key({ modkey, "Shift"            }, "s", function () move_to_tag(5)       end),
-    awful.key({ modkey, "Shift"            }, "d", function () move_to_tag(6)       end),
-    awful.key({ modkey, "Shift"            }, "z", function () move_to_tag(7)       end),
-    awful.key({ modkey, "Shift"            }, "x", function () move_to_tag(8)       end),
-    awful.key({ modkey, "Shift"            }, "c", function () move_to_tag(9)       end),
-
-    awful.key({ modkey, "Control", "Shift" }, "q", function () toggle_client_tag(1) end),
-    awful.key({ modkey, "Control", "Shift" }, "w", function () toggle_client_tag(2) end),
-    awful.key({ modkey, "Control", "Shift" }, "e", function () toggle_client_tag(3) end),
-    awful.key({ modkey, "Control", "Shift" }, "a", function () toggle_client_tag(4) end),
-    awful.key({ modkey, "Control", "Shift" }, "s", function () toggle_client_tag(5) end),
-    awful.key({ modkey, "Control", "Shift" }, "d", function () toggle_client_tag(6) end),
-    awful.key({ modkey, "Control", "Shift" }, "z", function () toggle_client_tag(7) end),
-    awful.key({ modkey, "Control", "Shift" }, "x", function () toggle_client_tag(8) end),
-    awful.key({ modkey, "Control", "Shift" }, "c", function () toggle_client_tag(9) end),
-    
-    -- Prompt
-    awful.key({ modkey },            "r",     function () mypromptbox[mouse.screen]:run() end),
-
-    awful.key({ modkey, "Mod1"    }, "x",
-              function ()
-                  awful.prompt.run({ prompt = "Run Lua code: " },
-                  mypromptbox[mouse.screen].widget,
-                  awful.util.eval, nil,
-                  awful.util.getdir("cache") .. "/history_eval")
-              end)
-)
-
-clientkeys = awful.util.table.join(
-    awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
-    awful.key({ modkey, "Mod1"    }, "c",      function (c) c:kill()                         end),
-    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
-    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
-    awful.key({ modkey,           }, "o",      awful.client.movetoscreen                        ),
-    awful.key({ modkey, "Shift"   }, "r",      function (c) c:redraw()                       end),
-    awful.key({ modkey,           }, "n",      function (c) c.minimized = not c.minimized    end),
-    awful.key({ modkey,           }, "m",
-        function (c)
-            c.maximized_horizontal = not c.maximized_horizontal
-            c.maximized_vertical   = not c.maximized_vertical
-        end)
-)
-
--- Compute the maximum number of digit we need, limited to 9
-keynumber = 0
-for s = 1, screen.count() do
-   keynumber = math.min(9, math.max(#tags[s], keynumber));
-end
-
-clientbuttons = awful.util.table.join(
-    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
-    awful.button({ modkey }, 1, awful.mouse.client.move),
-    awful.button({ modkey }, 3, awful.mouse.client.resize))
-
--- Set keys
-root.keys(globalkeys)
--- }}}
-
--- {{{ Rules
-awful.rules.rules = {
-    -- All clients will match this rule.
-    { rule = { },
-      properties = { border_width = beautiful.border_width,
-                     border_color = beautiful.border_normal,
-                     focus = true,
-                     keys = clientkeys,
-                     buttons = clientbuttons } },
-    { rule = { class = "MPlayer" },
-      properties = { floating = true } },
-    { rule = { class = "pinentry" },
-      properties = { floating = true } },
-    { rule = { class = "gimp" },
-      properties = { floating = true } },
-    { rule = { class = "gwibber", name = "gwibber" },
-      properties = { floating = true } },
-    -- Set Firefox to always map on tags number 2 of screen 1.
-    -- { rule = { class = "Firefox" },
-    --   properties = { tag = tags[1][2] } },
-}
--- }}}
-
--- {{{ Signals
--- Signal function to execute when a new client appears.
-client.add_signal("manage", function (c, startup)
-    -- Add a titlebar
-    -- awful.titlebar.add(c, { modkey = modkey })
-
-    -- Enable sloppy focus
-    c:add_signal("mouse::enter", function(c)
-        if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
-            and awful.client.focus.filter(c) then
-            client.focus = c
-        end
-    end)
-
-    if not startup then
-        -- Set the windows at the slave,
-        -- i.e. put it at the end of others instead of setting it master.
-        -- awful.client.setslave(c)
-
-        -- Put windows in a smart way, only if they does not set an initial position.
-        if not c.size_hints.user_position and not c.size_hints.program_position then
-            awful.placement.no_overlap(c)
-            awful.placement.no_offscreen(c)
-        end
-    end
-end)
-
-client.add_signal("focus", function(c) 
-                              c.border_color = beautiful.border_focus 
-                             -- c.opacity = 1
-                           end)
-client.add_signal("unfocus", function(c) 
-                                c.border_color = beautiful.border_normal 
-                               -- c.opacity = 0.7
-                             end)
--- }}}
-
-if fexists(os.getenv("HOME") .. "/.config/awesome/local_rc.lua") then
-   dofile(os.getenv("HOME") .. "/.config/awesome/local_rc.lua")
-end
diff --git a/dotawesome/themes/default/background.png b/dotawesome/themes/default/background.png
deleted file mode 100644
index 0d882b7..0000000
Binary files a/dotawesome/themes/default/background.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/dwindle.png b/dotawesome/themes/default/layouts/dwindle.png
deleted file mode 100644
index 943ece5..0000000
Binary files a/dotawesome/themes/default/layouts/dwindle.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/dwindlew.png b/dotawesome/themes/default/layouts/dwindlew.png
deleted file mode 100644
index 36de1ba..0000000
Binary files a/dotawesome/themes/default/layouts/dwindlew.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/fairh.png b/dotawesome/themes/default/layouts/fairh.png
deleted file mode 100644
index b4e289d..0000000
Binary files a/dotawesome/themes/default/layouts/fairh.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/fairhw.png b/dotawesome/themes/default/layouts/fairhw.png
deleted file mode 100644
index 514d66d..0000000
Binary files a/dotawesome/themes/default/layouts/fairhw.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/fairv.png b/dotawesome/themes/default/layouts/fairv.png
deleted file mode 100644
index e5aad70..0000000
Binary files a/dotawesome/themes/default/layouts/fairv.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/fairvw.png b/dotawesome/themes/default/layouts/fairvw.png
deleted file mode 100644
index f97ce56..0000000
Binary files a/dotawesome/themes/default/layouts/fairvw.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/floating.png b/dotawesome/themes/default/layouts/floating.png
deleted file mode 100644
index cbc7804..0000000
Binary files a/dotawesome/themes/default/layouts/floating.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/floatingw.png b/dotawesome/themes/default/layouts/floatingw.png
deleted file mode 100644
index 7ddf7ae..0000000
Binary files a/dotawesome/themes/default/layouts/floatingw.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/fullscreen.png b/dotawesome/themes/default/layouts/fullscreen.png
deleted file mode 100644
index 46716f5..0000000
Binary files a/dotawesome/themes/default/layouts/fullscreen.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/fullscreenw.png b/dotawesome/themes/default/layouts/fullscreenw.png
deleted file mode 100644
index 2c3cfad..0000000
Binary files a/dotawesome/themes/default/layouts/fullscreenw.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/magnifier.png b/dotawesome/themes/default/layouts/magnifier.png
deleted file mode 100644
index 1476555..0000000
Binary files a/dotawesome/themes/default/layouts/magnifier.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/magnifierw.png b/dotawesome/themes/default/layouts/magnifierw.png
deleted file mode 100644
index 97c1d11..0000000
Binary files a/dotawesome/themes/default/layouts/magnifierw.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/max.png b/dotawesome/themes/default/layouts/max.png
deleted file mode 100644
index 4246d56..0000000
Binary files a/dotawesome/themes/default/layouts/max.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/maxw.png b/dotawesome/themes/default/layouts/maxw.png
deleted file mode 100644
index 14c161a..0000000
Binary files a/dotawesome/themes/default/layouts/maxw.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/spiral.png b/dotawesome/themes/default/layouts/spiral.png
deleted file mode 100644
index a24faf5..0000000
Binary files a/dotawesome/themes/default/layouts/spiral.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/spiralw.png b/dotawesome/themes/default/layouts/spiralw.png
deleted file mode 100644
index f34ceb0..0000000
Binary files a/dotawesome/themes/default/layouts/spiralw.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/tile.png b/dotawesome/themes/default/layouts/tile.png
deleted file mode 100644
index 071a385..0000000
Binary files a/dotawesome/themes/default/layouts/tile.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/tilebottom.png b/dotawesome/themes/default/layouts/tilebottom.png
deleted file mode 100644
index aeedbe2..0000000
Binary files a/dotawesome/themes/default/layouts/tilebottom.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/tilebottomw.png b/dotawesome/themes/default/layouts/tilebottomw.png
deleted file mode 100644
index f42da9d..0000000
Binary files a/dotawesome/themes/default/layouts/tilebottomw.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/tileleft.png b/dotawesome/themes/default/layouts/tileleft.png
deleted file mode 100644
index ab55e08..0000000
Binary files a/dotawesome/themes/default/layouts/tileleft.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/tileleftw.png b/dotawesome/themes/default/layouts/tileleftw.png
deleted file mode 100644
index c18e7b4..0000000
Binary files a/dotawesome/themes/default/layouts/tileleftw.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/tiletop.png b/dotawesome/themes/default/layouts/tiletop.png
deleted file mode 100644
index 3febc35..0000000
Binary files a/dotawesome/themes/default/layouts/tiletop.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/tiletopw.png b/dotawesome/themes/default/layouts/tiletopw.png
deleted file mode 100644
index daf965f..0000000
Binary files a/dotawesome/themes/default/layouts/tiletopw.png and /dev/null differ
diff --git a/dotawesome/themes/default/layouts/tilew.png b/dotawesome/themes/default/layouts/tilew.png
deleted file mode 100644
index c722a35..0000000
Binary files a/dotawesome/themes/default/layouts/tilew.png and /dev/null differ
diff --git a/dotawesome/themes/default/submenu.png b/dotawesome/themes/default/submenu.png
deleted file mode 100644
index b2778e2..0000000
Binary files a/dotawesome/themes/default/submenu.png and /dev/null differ
diff --git a/dotawesome/themes/default/taglist/squarefw.png b/dotawesome/themes/default/taglist/squarefw.png
deleted file mode 100644
index 2a86430..0000000
Binary files a/dotawesome/themes/default/taglist/squarefw.png and /dev/null differ
diff --git a/dotawesome/themes/default/taglist/squarew.png b/dotawesome/themes/default/taglist/squarew.png
deleted file mode 100644
index 913f2ca..0000000
Binary files a/dotawesome/themes/default/taglist/squarew.png and /dev/null differ
diff --git a/dotawesome/themes/default/tasklist/floating.png b/dotawesome/themes/default/tasklist/floating.png
deleted file mode 100644
index f29e7f5..0000000
Binary files a/dotawesome/themes/default/tasklist/floating.png and /dev/null differ
diff --git a/dotawesome/themes/default/tasklist/floatingw.png b/dotawesome/themes/default/tasklist/floatingw.png
deleted file mode 100644
index eb802ae..0000000
Binary files a/dotawesome/themes/default/tasklist/floatingw.png and /dev/null differ
diff --git a/dotawesome/themes/default/theme.lua b/dotawesome/themes/default/theme.lua
deleted file mode 100644
index 63711b5..0000000
--- a/dotawesome/themes/default/theme.lua
+++ /dev/null
@@ -1,99 +0,0 @@
-base_loc = os.getenv("HOME") .. "/.config/awesome/themes/default/"
----------------------------
--- Default awesome theme --
----------------------------
-
-theme = {}
-
-theme.font          = "sans 8"
-
-theme.bg_normal     = "#000000"
-theme.bg_focus      = "#333333"
-theme.bg_urgent     = "#ff0000"
-theme.bg_minimize   = "#444444"
-
-theme.fg_normal     = "#aaaaaa"
-theme.fg_focus      = "#ffffff"
-theme.fg_urgent     = "#ffffff"
-theme.fg_minimize   = "#ffffff"
-
-theme.border_width  = "1"
-theme.border_normal = "#000000"
-theme.border_focus  = "#535d6c"
-theme.border_marked = "#91231c"
-
--- There are another variables sets
--- overriding the default one when
--- defined, the sets are:
--- [taglist|tasklist]_[bg|fg]_[focus|urgent]
--- titlebar_[bg|fg]_[normal|focus]
--- Example:
---taglist_bg_focus = #ff0000
-
--- Display the taglist squares
-theme.taglist_squares_sel    = base_loc .. "taglist/squarefw.png"
-theme.taglist_squares_unsel  = base_loc .. "taglist/squarew.png"
-
-theme.tasklist_floating_icon = base_loc .. "tasklist/floatingw.png"
-
--- Variables set for theming menu
--- menu_[bg|fg]_[normal|focus]
--- menu_[border_color|border_width]
-theme.menu_submenu_icon = base_loc .. "submenu.png"
-theme.menu_height       = "15"
-theme.menu_width        = "100"
-
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---bg_widget    = #cc0000
-
--- Define the image to load
-theme.titlebar_close_button_normal              = base_loc .. "titlebar/close_normal.png"
-theme.titlebar_close_button_focus               = base_loc .. "titlebar/close_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive     = base_loc .. "titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive      = base_loc .. "titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active       = base_loc .. "titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active        = base_loc .. "titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive    = base_loc .. "titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive     = base_loc .. "titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active      = base_loc .. "titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active       = base_loc .. "titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive  = base_loc .. "titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive   = base_loc .. "titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active    = base_loc .. "titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active     = base_loc .. "titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = base_loc .. "titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = base_loc .. "titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active   = base_loc .. "titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active    = base_loc .. "titlebar/maximized_focus_active.png"
-
--- You can use your own command to set your wallpaper
---theme.wallpaper_cmd = { "awsetbg /usr/share/awesome/themes/default/background.png" }
-
--- You can use your own layout icons like this:
-theme.layout_fairh        = base_loc .. "layouts/fairhw.png"
-theme.layout_fairv        = base_loc .. "layouts/fairvw.png"
-theme.layout_floating     = base_loc .. "layouts/floatingw.png"
-theme.layout_magnifier    = base_loc .. "layouts/magnifierw.png"
-theme.layout_max          = base_loc .. "layouts/maxw.png"
-theme.layout_fullscreen   = base_loc .. "layouts/fullscreenw.png"
-theme.layout_tilebottom   = base_loc .. "layouts/tilebottomw.png"
-theme.layout_tileleft     = base_loc .. "layouts/tileleftw.png"
-theme.layout_tile         = base_loc .. "layouts/tilew.png"
-theme.layout_tiletop      = base_loc .. "layouts/tiletopw.png"
-
-theme.awesome_icon        = "/usr/share/awesome/icons/awesome16.png"
-
-theme.xmms2_play_icon     = base_loc .. "xmms2/play.png"
-theme.xmms2_pause_icon    = base_loc .. "xmms2/pause.png"
-theme.xmms2_next_icon     = base_loc .. "xmms2/next.png"
-theme.xmms2_previous_icon = base_loc .. "xmms2/previous.png"
-theme.xmms2_stop_icon     = base_loc .. "xmms2/stop.png"
-
-return theme
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/dotawesome/themes/default/titlebar/close_focus.png b/dotawesome/themes/default/titlebar/close_focus.png
deleted file mode 100644
index a5b7958..0000000
Binary files a/dotawesome/themes/default/titlebar/close_focus.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/close_normal.png b/dotawesome/themes/default/titlebar/close_normal.png
deleted file mode 100644
index fe6ebe0..0000000
Binary files a/dotawesome/themes/default/titlebar/close_normal.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/floating_focus_active.png b/dotawesome/themes/default/titlebar/floating_focus_active.png
deleted file mode 100644
index 3447bb2..0000000
Binary files a/dotawesome/themes/default/titlebar/floating_focus_active.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/floating_focus_inactive.png b/dotawesome/themes/default/titlebar/floating_focus_inactive.png
deleted file mode 100644
index 8d724bf..0000000
Binary files a/dotawesome/themes/default/titlebar/floating_focus_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/floating_normal_active.png b/dotawesome/themes/default/titlebar/floating_normal_active.png
deleted file mode 100644
index 21a67ee..0000000
Binary files a/dotawesome/themes/default/titlebar/floating_normal_active.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/floating_normal_inactive.png b/dotawesome/themes/default/titlebar/floating_normal_inactive.png
deleted file mode 100644
index ab0f89c..0000000
Binary files a/dotawesome/themes/default/titlebar/floating_normal_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/maximized_focus_active.png b/dotawesome/themes/default/titlebar/maximized_focus_active.png
deleted file mode 100644
index 78a2914..0000000
Binary files a/dotawesome/themes/default/titlebar/maximized_focus_active.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/maximized_focus_inactive.png b/dotawesome/themes/default/titlebar/maximized_focus_inactive.png
deleted file mode 100644
index e79dc1e..0000000
Binary files a/dotawesome/themes/default/titlebar/maximized_focus_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/maximized_normal_active.png b/dotawesome/themes/default/titlebar/maximized_normal_active.png
deleted file mode 100644
index 7765759..0000000
Binary files a/dotawesome/themes/default/titlebar/maximized_normal_active.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/maximized_normal_inactive.png b/dotawesome/themes/default/titlebar/maximized_normal_inactive.png
deleted file mode 100644
index 394a87b..0000000
Binary files a/dotawesome/themes/default/titlebar/maximized_normal_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/ontop_focus_active.png b/dotawesome/themes/default/titlebar/ontop_focus_active.png
deleted file mode 100644
index f954bed..0000000
Binary files a/dotawesome/themes/default/titlebar/ontop_focus_active.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/ontop_focus_inactive.png b/dotawesome/themes/default/titlebar/ontop_focus_inactive.png
deleted file mode 100644
index fdb4e94..0000000
Binary files a/dotawesome/themes/default/titlebar/ontop_focus_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/ontop_normal_active.png b/dotawesome/themes/default/titlebar/ontop_normal_active.png
deleted file mode 100644
index fc60895..0000000
Binary files a/dotawesome/themes/default/titlebar/ontop_normal_active.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/ontop_normal_inactive.png b/dotawesome/themes/default/titlebar/ontop_normal_inactive.png
deleted file mode 100644
index cb2dd7f..0000000
Binary files a/dotawesome/themes/default/titlebar/ontop_normal_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/sticky_focus_active.png b/dotawesome/themes/default/titlebar/sticky_focus_active.png
deleted file mode 100644
index 1106399..0000000
Binary files a/dotawesome/themes/default/titlebar/sticky_focus_active.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/sticky_focus_inactive.png b/dotawesome/themes/default/titlebar/sticky_focus_inactive.png
deleted file mode 100644
index 783df69..0000000
Binary files a/dotawesome/themes/default/titlebar/sticky_focus_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/sticky_normal_active.png b/dotawesome/themes/default/titlebar/sticky_normal_active.png
deleted file mode 100644
index ea1f2a6..0000000
Binary files a/dotawesome/themes/default/titlebar/sticky_normal_active.png and /dev/null differ
diff --git a/dotawesome/themes/default/titlebar/sticky_normal_inactive.png b/dotawesome/themes/default/titlebar/sticky_normal_inactive.png
deleted file mode 100644
index aabb54a..0000000
Binary files a/dotawesome/themes/default/titlebar/sticky_normal_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/default/xmms2/next.png b/dotawesome/themes/default/xmms2/next.png
deleted file mode 100644
index 17d694d..0000000
Binary files a/dotawesome/themes/default/xmms2/next.png and /dev/null differ
diff --git a/dotawesome/themes/default/xmms2/pause.png b/dotawesome/themes/default/xmms2/pause.png
deleted file mode 100644
index 50c1481..0000000
Binary files a/dotawesome/themes/default/xmms2/pause.png and /dev/null differ
diff --git a/dotawesome/themes/default/xmms2/play.png b/dotawesome/themes/default/xmms2/play.png
deleted file mode 100644
index 189ca44..0000000
Binary files a/dotawesome/themes/default/xmms2/play.png and /dev/null differ
diff --git a/dotawesome/themes/default/xmms2/previous.png b/dotawesome/themes/default/xmms2/previous.png
deleted file mode 100644
index a79ec71..0000000
Binary files a/dotawesome/themes/default/xmms2/previous.png and /dev/null differ
diff --git a/dotawesome/themes/default/xmms2/stop.png b/dotawesome/themes/default/xmms2/stop.png
deleted file mode 100644
index 4792366..0000000
Binary files a/dotawesome/themes/default/xmms2/stop.png and /dev/null differ
diff --git a/dotawesome/themes/test.png b/dotawesome/themes/test.png
deleted file mode 100644
index 7641da8..0000000
Binary files a/dotawesome/themes/test.png and /dev/null differ
diff --git a/dotawesome/themes/vt/background.png b/dotawesome/themes/vt/background.png
deleted file mode 100755
index 0d882b7..0000000
Binary files a/dotawesome/themes/vt/background.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/fairh.png b/dotawesome/themes/vt/layouts/fairh.png
deleted file mode 100755
index b4e289d..0000000
Binary files a/dotawesome/themes/vt/layouts/fairh.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/fairhw.png b/dotawesome/themes/vt/layouts/fairhw.png
deleted file mode 100755
index 514d66d..0000000
Binary files a/dotawesome/themes/vt/layouts/fairhw.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/fairv.png b/dotawesome/themes/vt/layouts/fairv.png
deleted file mode 100755
index e5aad70..0000000
Binary files a/dotawesome/themes/vt/layouts/fairv.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/fairvw.png b/dotawesome/themes/vt/layouts/fairvw.png
deleted file mode 100755
index f97ce56..0000000
Binary files a/dotawesome/themes/vt/layouts/fairvw.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/floating.png b/dotawesome/themes/vt/layouts/floating.png
deleted file mode 100755
index cbc7804..0000000
Binary files a/dotawesome/themes/vt/layouts/floating.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/floatingw.png b/dotawesome/themes/vt/layouts/floatingw.png
deleted file mode 100755
index 7ddf7ae..0000000
Binary files a/dotawesome/themes/vt/layouts/floatingw.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/fullscreen.png b/dotawesome/themes/vt/layouts/fullscreen.png
deleted file mode 100755
index 46716f5..0000000
Binary files a/dotawesome/themes/vt/layouts/fullscreen.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/fullscreenw.png b/dotawesome/themes/vt/layouts/fullscreenw.png
deleted file mode 100755
index 2c3cfad..0000000
Binary files a/dotawesome/themes/vt/layouts/fullscreenw.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/magnifier.png b/dotawesome/themes/vt/layouts/magnifier.png
deleted file mode 100755
index 1476555..0000000
Binary files a/dotawesome/themes/vt/layouts/magnifier.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/magnifierw.png b/dotawesome/themes/vt/layouts/magnifierw.png
deleted file mode 100755
index 97c1d11..0000000
Binary files a/dotawesome/themes/vt/layouts/magnifierw.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/max.png b/dotawesome/themes/vt/layouts/max.png
deleted file mode 100755
index 4246d56..0000000
Binary files a/dotawesome/themes/vt/layouts/max.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/maxw.png b/dotawesome/themes/vt/layouts/maxw.png
deleted file mode 100755
index 14c161a..0000000
Binary files a/dotawesome/themes/vt/layouts/maxw.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/tile.png b/dotawesome/themes/vt/layouts/tile.png
deleted file mode 100755
index 071a385..0000000
Binary files a/dotawesome/themes/vt/layouts/tile.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/tilebottom.png b/dotawesome/themes/vt/layouts/tilebottom.png
deleted file mode 100755
index aeedbe2..0000000
Binary files a/dotawesome/themes/vt/layouts/tilebottom.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/tilebottomw.png b/dotawesome/themes/vt/layouts/tilebottomw.png
deleted file mode 100755
index f42da9d..0000000
Binary files a/dotawesome/themes/vt/layouts/tilebottomw.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/tileleft.png b/dotawesome/themes/vt/layouts/tileleft.png
deleted file mode 100755
index ab55e08..0000000
Binary files a/dotawesome/themes/vt/layouts/tileleft.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/tileleftw.png b/dotawesome/themes/vt/layouts/tileleftw.png
deleted file mode 100755
index c18e7b4..0000000
Binary files a/dotawesome/themes/vt/layouts/tileleftw.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/tiletop.png b/dotawesome/themes/vt/layouts/tiletop.png
deleted file mode 100755
index 3febc35..0000000
Binary files a/dotawesome/themes/vt/layouts/tiletop.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/tiletopw.png b/dotawesome/themes/vt/layouts/tiletopw.png
deleted file mode 100755
index daf965f..0000000
Binary files a/dotawesome/themes/vt/layouts/tiletopw.png and /dev/null differ
diff --git a/dotawesome/themes/vt/layouts/tilew.png b/dotawesome/themes/vt/layouts/tilew.png
deleted file mode 100755
index c722a35..0000000
Binary files a/dotawesome/themes/vt/layouts/tilew.png and /dev/null differ
diff --git a/dotawesome/themes/vt/submenu.png b/dotawesome/themes/vt/submenu.png
deleted file mode 100755
index b2778e2..0000000
Binary files a/dotawesome/themes/vt/submenu.png and /dev/null differ
diff --git a/dotawesome/themes/vt/taglist/squarefw.png b/dotawesome/themes/vt/taglist/squarefw.png
deleted file mode 100755
index 2a86430..0000000
Binary files a/dotawesome/themes/vt/taglist/squarefw.png and /dev/null differ
diff --git a/dotawesome/themes/vt/taglist/squarew.png b/dotawesome/themes/vt/taglist/squarew.png
deleted file mode 100755
index 913f2ca..0000000
Binary files a/dotawesome/themes/vt/taglist/squarew.png and /dev/null differ
diff --git a/dotawesome/themes/vt/tasklist/floating.png b/dotawesome/themes/vt/tasklist/floating.png
deleted file mode 100755
index f29e7f5..0000000
Binary files a/dotawesome/themes/vt/tasklist/floating.png and /dev/null differ
diff --git a/dotawesome/themes/vt/tasklist/floatingw.png b/dotawesome/themes/vt/tasklist/floatingw.png
deleted file mode 100755
index eb802ae..0000000
Binary files a/dotawesome/themes/vt/tasklist/floatingw.png and /dev/null differ
diff --git a/dotawesome/themes/vt/theme.lua b/dotawesome/themes/vt/theme.lua
deleted file mode 100755
index 90fdc26..0000000
--- a/dotawesome/themes/vt/theme.lua
+++ /dev/null
@@ -1,98 +0,0 @@
----------------------------
--- Default awesome theme --
----------------------------
-
-theme = {}
-
-theme.font          = "sans 8"
-
-theme.bg_normal     = "#174800"
-theme.bg_focus      = "#333333"
-theme.bg_urgent     = "#ff0000"
-theme.bg_minimize   = "#444444"
-
-theme.fg_normal     = "#aaaaaa"
-theme.fg_focus      = "#ffffff"
-theme.fg_urgent     = "#ffffff"
-theme.fg_minimize  = "#ffffff"
-
-theme.border_width  = "1"
-theme.border_normal = "#000000"
-theme.border_focus  = "#535d6c"
-theme.border_marked = "#91231c"
-
--- There are another variables sets
--- overriding the default one when
--- defined, the sets are:
--- [taglist|tasklist]_[bg|fg]_[focus|urgent]
--- titlebar_[bg|fg]_[normal|focus]
--- Example:
---taglist_bg_focus = #ff0000
-
--- Display the taglist squares
-theme.taglist_squares_sel = "/usr/share/awesome/themes/default/taglist/squarefw.png"
-theme.taglist_squares_unsel = "/usr/share/awesome/themes/default/taglist/squarew.png"
-
-theme.tasklist_floating_icon = "/usr/share/awesome/themes/default/tasklist/floatingw.png"
-
--- Variables set for theming menu
--- menu_[bg|fg]_[normal|focus]
--- menu_[border_color|border_width]
-theme.menu_submenu_icon = "/usr/share/awesome/themes/default/submenu.png"
-theme.menu_height   = "15"
-theme.menu_width    = "100"
-
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---bg_widget    = #cc0000
-
--- Define the image to load
-theme.titlebar_close_button_normal = "/usr/share/awesome/themes/default/titlebar/close_normal.png"
-theme.titlebar_close_button_focus = "/usr/share/awesome/themes/default/titlebar/close_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = "/usr/share/awesome/themes/default/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active = "/usr/share/awesome/themes/default/titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = "/usr/share/awesome/themes/default/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active = "/usr/share/awesome/themes/default/titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = "/usr/share/awesome/themes/default/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active = "/usr/share/awesome/themes/default/titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = "/usr/share/awesome/themes/default/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active = "/usr/share/awesome/themes/default/titlebar/maximized_focus_active.png"
-
--- You can use your own command to set your wallpaper
-theme.wallpaper_cmd = { "awsetbg /usr/share/awesome/themes/default/background.png" }
-
--- You can use your own layout icons like this:
-theme.layout_fairh = "/usr/share/awesome/themes/default/layouts/fairhw.png"
-theme.layout_fairv = "/usr/share/awesome/themes/default/layouts/fairvw.png"
-theme.layout_floating = "/usr/share/awesome/themes/default/layouts/floatingw.png"
-theme.layout_magnifier = "/usr/share/awesome/themes/default/layouts/magnifierw.png"
-theme.layout_max = "/usr/share/awesome/themes/default/layouts/maxw.png"
-theme.layout_fullscreen = "/usr/share/awesome/themes/default/layouts/fullscreenw.png"
-theme.layout_tilebottom = "/usr/share/awesome/themes/default/layouts/tilebottomw.png"
-theme.layout_tileleft = "/usr/share/awesome/themes/default/layouts/tileleftw.png"
-theme.layout_tile = "/usr/share/awesome/themes/default/layouts/tilew.png"
-theme.layout_tiletop = "/usr/share/awesome/themes/default/layouts/tiletopw.png"
-
-theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png"
-
-theme.xmms2_play_icon = "/home/tom/.config/awesome/themes/default/xmms2/play.png"
-theme.xmms2_pause_icon = "/home/tom/.config/awesome/themes/default/xmms2/pause.png"
-theme.xmms2_next_icon = "/home/tom/.config/awesome/themes/default/xmms2/next.png"
-theme.xmms2_previous_icon = "/home/tom/.config/awesome/themes/default/xmms2/previous.png"
-theme.xmms2_stop_icon = "/home/tom/.config/awesome/themes/default/xmms2/stop.png"
-
-return theme
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/dotawesome/themes/vt/titlebar/close_focus.png b/dotawesome/themes/vt/titlebar/close_focus.png
deleted file mode 100755
index a5b7958..0000000
Binary files a/dotawesome/themes/vt/titlebar/close_focus.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/close_normal.png b/dotawesome/themes/vt/titlebar/close_normal.png
deleted file mode 100755
index fe6ebe0..0000000
Binary files a/dotawesome/themes/vt/titlebar/close_normal.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/floating_focus_active.png b/dotawesome/themes/vt/titlebar/floating_focus_active.png
deleted file mode 100755
index 3447bb2..0000000
Binary files a/dotawesome/themes/vt/titlebar/floating_focus_active.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/floating_focus_inactive.png b/dotawesome/themes/vt/titlebar/floating_focus_inactive.png
deleted file mode 100755
index 8d724bf..0000000
Binary files a/dotawesome/themes/vt/titlebar/floating_focus_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/floating_normal_active.png b/dotawesome/themes/vt/titlebar/floating_normal_active.png
deleted file mode 100755
index 21a67ee..0000000
Binary files a/dotawesome/themes/vt/titlebar/floating_normal_active.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/floating_normal_inactive.png b/dotawesome/themes/vt/titlebar/floating_normal_inactive.png
deleted file mode 100755
index ab0f89c..0000000
Binary files a/dotawesome/themes/vt/titlebar/floating_normal_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/maximized_focus_active.png b/dotawesome/themes/vt/titlebar/maximized_focus_active.png
deleted file mode 100755
index 78a2914..0000000
Binary files a/dotawesome/themes/vt/titlebar/maximized_focus_active.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/maximized_focus_inactive.png b/dotawesome/themes/vt/titlebar/maximized_focus_inactive.png
deleted file mode 100755
index e79dc1e..0000000
Binary files a/dotawesome/themes/vt/titlebar/maximized_focus_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/maximized_normal_active.png b/dotawesome/themes/vt/titlebar/maximized_normal_active.png
deleted file mode 100755
index 7765759..0000000
Binary files a/dotawesome/themes/vt/titlebar/maximized_normal_active.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/maximized_normal_inactive.png b/dotawesome/themes/vt/titlebar/maximized_normal_inactive.png
deleted file mode 100755
index 394a87b..0000000
Binary files a/dotawesome/themes/vt/titlebar/maximized_normal_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/ontop_focus_active.png b/dotawesome/themes/vt/titlebar/ontop_focus_active.png
deleted file mode 100755
index f954bed..0000000
Binary files a/dotawesome/themes/vt/titlebar/ontop_focus_active.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/ontop_focus_inactive.png b/dotawesome/themes/vt/titlebar/ontop_focus_inactive.png
deleted file mode 100755
index fdb4e94..0000000
Binary files a/dotawesome/themes/vt/titlebar/ontop_focus_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/ontop_normal_active.png b/dotawesome/themes/vt/titlebar/ontop_normal_active.png
deleted file mode 100755
index fc60895..0000000
Binary files a/dotawesome/themes/vt/titlebar/ontop_normal_active.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/ontop_normal_inactive.png b/dotawesome/themes/vt/titlebar/ontop_normal_inactive.png
deleted file mode 100755
index cb2dd7f..0000000
Binary files a/dotawesome/themes/vt/titlebar/ontop_normal_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/sticky_focus_active.png b/dotawesome/themes/vt/titlebar/sticky_focus_active.png
deleted file mode 100755
index 1106399..0000000
Binary files a/dotawesome/themes/vt/titlebar/sticky_focus_active.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/sticky_focus_inactive.png b/dotawesome/themes/vt/titlebar/sticky_focus_inactive.png
deleted file mode 100755
index 783df69..0000000
Binary files a/dotawesome/themes/vt/titlebar/sticky_focus_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/sticky_normal_active.png b/dotawesome/themes/vt/titlebar/sticky_normal_active.png
deleted file mode 100755
index ea1f2a6..0000000
Binary files a/dotawesome/themes/vt/titlebar/sticky_normal_active.png and /dev/null differ
diff --git a/dotawesome/themes/vt/titlebar/sticky_normal_inactive.png b/dotawesome/themes/vt/titlebar/sticky_normal_inactive.png
deleted file mode 100755
index aabb54a..0000000
Binary files a/dotawesome/themes/vt/titlebar/sticky_normal_inactive.png and /dev/null differ
diff --git a/dotawesome/themes/vt/xmms2/next.png b/dotawesome/themes/vt/xmms2/next.png
deleted file mode 100644
index 17d694d..0000000
Binary files a/dotawesome/themes/vt/xmms2/next.png and /dev/null differ
diff --git a/dotawesome/themes/vt/xmms2/pause.png b/dotawesome/themes/vt/xmms2/pause.png
deleted file mode 100644
index 50c1481..0000000
Binary files a/dotawesome/themes/vt/xmms2/pause.png and /dev/null differ
diff --git a/dotawesome/themes/vt/xmms2/play.png b/dotawesome/themes/vt/xmms2/play.png
deleted file mode 100644
index 189ca44..0000000
Binary files a/dotawesome/themes/vt/xmms2/play.png and /dev/null differ
diff --git a/dotawesome/themes/vt/xmms2/previous.png b/dotawesome/themes/vt/xmms2/previous.png
deleted file mode 100644
index a79ec71..0000000
Binary files a/dotawesome/themes/vt/xmms2/previous.png and /dev/null differ
diff --git a/dotawesome/themes/vt/xmms2/stop.png b/dotawesome/themes/vt/xmms2/stop.png
deleted file mode 100644
index 4792366..0000000
Binary files a/dotawesome/themes/vt/xmms2/stop.png and /dev/null differ
diff --git a/dotemacs/.gitignore b/dotemacs/.gitignore
deleted file mode 100644
index c531d98..0000000
--- a/dotemacs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.elc
diff --git a/dotemacs/install.sh b/dotemacs/install.sh
deleted file mode 100644
index 18900b1..0000000
--- a/dotemacs/install.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-INSTALL_BASEDIR=$1
-
-echo "Linking $INSTALL_BASEDIR/.emacs to $HOME/.emacs"
-ln -sf $INSTALL_BASEDIR/.emacs $HOME/.emacs
-if [ -d $HOME/.emacs.d ]; then
-    if [ -d $HOME/.emacs.d_backup ]; then
-        echo "Removing old $HOME/.emacs.d_backup"
-        rm -rf $HOME/.emacs.d_backup
-    fi
-    echo "Moving old $HOME/.emacs.d"
-    mv $HOME/.emacs.d $HOME/.emacs.d_backup
-fi
-echo "Linking $INSTALL_BASEDIR/.emacs to $HOME/.emacs"
-ln -sf $INSTALL_BASEDIR/.emacs.d $HOME/.emacs.d
diff --git a/install.bat b/install.bat
deleted file mode 100644
index e3c524e..0000000
--- a/install.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-REM An install script for windows
-
-echo "Copying .emacs to %APPDATA%\\"
-copy /Y .emacs %APPDATA%\
-echo "Copying .emacs.d to %APPDATA%\\"
-copy /Y .emacs.d %APPDATA%\
\ No newline at end of file
diff --git a/install.sh b/install.sh
old mode 100755
new mode 100644
index b7da86b..18900b1
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,5 @@
-INSTALL_BASEFILE=`readlink -f $0`
-INSTALL_BASEDIR=`dirname $INSTALL_BASEFILE`
+INSTALL_BASEDIR=$1
 
-# EMACS
 echo "Linking $INSTALL_BASEDIR/.emacs to $HOME/.emacs"
 ln -sf $INSTALL_BASEDIR/.emacs $HOME/.emacs
 if [ -d $HOME/.emacs.d ]; then
@@ -14,27 +12,3 @@ if [ -d $HOME/.emacs.d ]; then
 fi
 echo "Linking $INSTALL_BASEDIR/.emacs to $HOME/.emacs"
 ln -sf $INSTALL_BASEDIR/.emacs.d $HOME/.emacs.d
-
-# XDEFAULTS
-echo "Linking $INSTALL_BASEDIR/.Xdefaults to $HOME/.Xdefaults"
-ln -sf $INSTALL_BASEDIR/.Xdefaults $HOME/.Xdefaults
-
-# XMODMAP
-echo "Linking $INSTALL_BASEDIR/.Xmodmap to $HOME/.Xmodmap"
-ln -sf $INSTALL_BASEDIR/.Xmodmap $HOME/.Xmodmap
-
-# conkeror
-echo "Linking $INSTALL_BASEDIR/.conkerorrc to $HOME/.conkerorrc"
-ln -sf $INSTALL_BASEDIR/.conkerorrc $HOME/.conkerorrc
-
-echo "Linking #INSTALL_BASEDIR/awesome to $HOME/.config/awesome"
-if [ -d $HOME/.config/awesome ]; then
-    if [ -d $HOME/.config/awesome_backup ]; then
-        echo "Removing old $HOME/.config/awesome_backup"
-        rm -rf $HOME/.config/awesome_backup
-    fi
-    echo "Moving old $HOME/.config/awesome"
-    mv $HOME/.config/awesome $HOME/.config/awesome_backup
-fi
-echo "Linking $INSTALL_BASEDIR/awesome to $HOME/.config/awesome"
-ln -sf $INSTALL_BASEDIR/awesome $HOME/.config/awesome
\ No newline at end of file