New stow hierarchy

24 files changed, 1061 insertions, 0 deletions

diff --git a/conkeror/.conkerorrc/ext_restore.js b/conkeror/.conkerorrc/ext_restore.js
new file mode 100644
index 0000000..39b125e
--- /dev/null
+++ b/conkeror/.conkerorrc/ext_restore.js
@@ -0,0 +1,33 @@
+/// From http://conkeror.org/Tips#Restore_Killed_Buffer_Url
+// I think by the time kill_buffer_hook runs the buffer is gone so I
+// patch kill_buffer
+
+var kill_buffer_original = kill_buffer_original || kill_buffer;
+
+var killed_buffer_urls = [];
+
+kill_buffer = function (buffer, force) {
+    if (buffer.display_uri_string) {
+        killed_buffer_urls.push(buffer.display_uri_string);
+    }
+
+    kill_buffer_original(buffer,force);
+};
+
+interactive("restore-killed-buffer-url", "Loads url from a previously killed buffer",
+            function restore_killed_buffer_url (I) {
+                if (killed_buffer_urls.length !== 0) {
+                    var url = yield I.minibuffer.read(
+                        $prompt = "Restore killed url:",
+                        $completer = all_word_completer($completions = killed_buffer_urls),
+                        $default_completion = killed_buffer_urls[killed_buffer_urls.length - 1],
+                        $auto_complete = "url",
+                        $auto_complete_initial = true,
+                        $auto_complete_delay = 0,
+                        $match_required);
+
+                    load_url_in_new_buffer(url);
+                } else {
+                    I.window.minibuffer.message("No killed buffer urls");
+                }
+            });
diff --git a/conkeror/.conkerorrc/gtk2rc b/conkeror/.conkerorrc/gtk2rc
new file mode 100644
index 0000000..fd511e5
--- /dev/null
+++ b/conkeror/.conkerorrc/gtk2rc
@@ -0,0 +1,11 @@
+include "/home/slash/.gtkrc-2.0"
+
+style "noscrollbars" {
+      GtkScrollbar::slider-width=0
+      GtkScrollbar::trough-border=0
+      GtkScrollbar::has-backward-stepper=0
+      GtkScrollbar::has-forward-stepper=0
+      GtkScrollbar::has-secondary-backward-stepper=0
+      GtkScrollbar::has-secondary-forward-stepper=0
+}
+widget "MozillaGtkWidget.*" style "noscrollbars"
diff --git a/conkeror/.conkerorrc/init.js b/conkeror/.conkerorrc/init.js
new file mode 100644
index 0000000..520ef04
--- /dev/null
+++ b/conkeror/.conkerorrc/init.js
@@ -0,0 +1,315 @@
+require("content-policy.js");
+require("favicon");
+require("session");
+
+load_paths.push("file:///usr/local/clark/share/conkeror/modules/");
+load_paths.push("file:///home/slash/projects/cdispass/");
+theme_load_paths.push("/home/slash/.conkerorrc/themes/");
+
+require("clark");
+require("cdispass");
+
+define_browser_object_class(
+    "history-url", null,
+    function (I, prompt) {
+        check_buffer(I.buffer, content_buffer);
+        var result = yield I.buffer.window.minibuffer.read_url(
+            $prompt = prompt, $use_webjumps = false, $use_history = true,
+            $use_bookmarks = false, $sort_order = 'date_descending'
+        );
+        yield co_return(result);
+    }
+);
+
+function ext_title_format(window) {
+    return '(' + get_current_profile() +') '
+        + window.buffers.current.description;
+}
+
+function oni_add_sheet(css) {
+    let (sheet = get_home_directory()) {
+        sheet.append(".conkerorrc");
+        sheet.append("styles");
+        sheet.append(css);
+        register_user_stylesheet(make_uri(sheet));
+    };
+}
+
+function oni_before_quit_func() {
+    var w = get_recent_conkeror_window();
+    var result = (w == null) ||
+            "y" == (yield w.minibuffer.read_single_character_option(
+                $prompt="Quit Conkeror? (y/n)",
+                $options=["y", "n"]));
+    yield co_return(result);
+}
+
+function oni_block_flash(content_type, content_location) {
+    var Y = content_policy_accept, N = content_policy_reject;
+    var action = ({ "youtube.com": Y }
+                  [content_location.host] || N);
+
+    if (action == N)
+        dumpln("blocked flash: " + content_location.spec);
+
+    return action;
+}
+
+function oni_escape(str) {
+    return str.replace(/(["$`])/g, '\\$1');
+}
+
+function oni_org_store_link(I) {
+    var cmd_str = 'emacsclient \"org-protocol://store-link://'
+            + encodeURIComponent(I.buffer.display_uri_string) + '/'
+            + encodeURIComponent(I.buffer.document.title) + '\"';
+
+    if (I.window != null) {
+        window.minibuffer.message('Issuing ' + cmd_str);
+    }
+
+    shell_command_blind(cmd_str);
+}
+interactive("org-store-link",
+            "Stores [[url][title]] as org link and copies url to emacs "
+            + "kill ring",
+            oni_org_store_link);
+
+interactive("find-url-from-history",
+            "Find a page from history in the current buffer",
+            "find-url",
+            $browser_object = browser_object_history_url);
+interactive("find-url-from-history-new-buffer",
+            "Find a page from history in a new buffer",
+            "find-url-new-buffer",
+            $browser_object = browser_object_history_url);
+
+define_webjump("emacswiki",
+               "https://duckduckgo.com/?q=%s+site%3Aemacswiki.org",
+               $alternative="http://www.emacswiki.org");
+define_webjump("php",
+               "http://www.php.net/manual-lookup.php?pattern=%s&scope=quickref",
+               $alternative="http://www.php.net");
+define_webjump("python",
+               "http://docs.python.org/search.html?q=%s&check_keywords=yes&area=default",
+               $alternative="http://www.python.org");
+define_webjump("ddg",
+               "https://duckduckgo.com/?q=%s",
+               $alternative="https://duckduckgo.com");
+define_webjump("metal-archives",
+               "http://www.metal-archives.com/search?searchString=%s&type=band_name",
+               $alternative="http://www.metal-archives.com");
+define_webjump("djangodocs",
+               "https://docs.djangoproject.com/search/?q=%s&release=5",
+               $alternative="https://docs.djangoproject.com/");
+define_webjump("google",
+               "https://duckduckgo.com?q=!google%%20%s");
+define_webjump("github",
+               "https://github.com/search?q=%s&type=Everything&repo=&langOverride=&start_value=1",
+               $alternative="https://github.com");
+define_webjump("mdn",
+               "https://developer.mozilla.org/en-US/search?q=%s",
+               $alternative="https://developer.mozilla.org/");
+define_webjump("monsterhunter",
+               "http://monsterhunter.wikia.com/wiki/index.php?search=%s&fulltext=Search",
+               $alternative="http://monsterhunter.wikia.com/");
+// Archlinux
+define_webjump("arch/wiki",
+               "https://wiki.archlinux.org/index.php?search=%s",
+               $alternative="https://wiki.archlinux.org");
+define_webjump("arch/aur",
+               "https://aur.archlinux.org/packages.php?O=0&K=%s&do_Search=Go",
+               $alternative="https://aur.archlinux.org");
+define_webjump("arch/packages",
+               "https://www.archlinux.org/packages/?sort=&q=%s&limit=50",
+               $alternative="https://packages.archlinux.org");
+
+/// Chickadee
+// From http://conkeror.org/Webjumps
+function chickadee_completer (input, cursor_position, conservative) {
+    var completions = [];
+    var content = yield send_http_request(
+        load_spec({uri: "http://api.call-cc.org/cdoc/ajax/prefix?q="+
+                   encodeURIComponent(input)}));
+    if (content.responseText) {
+        var parser = Cc["@mozilla.org/xmlextras/domparser;1"]
+            .createInstance(Ci.nsIDOMParser);
+        var doc = parser.parseFromString(content.responseText, "text/xml");
+        var res = doc.getElementsByTagName("li");
+        for (let i = 0, n = res.length; i < n; ++i) {
+            completions.push(res[i].textContent);
+        }
+    }
+    yield co_return(prefix_completer($completions = completions)
+                    (input, cursor_position, conservative));
+}
+define_webjump("chickadee",
+    "http://api.call-cc.org/cdoc?q=%s&query-name=Lookup",
+    $alternative = "http://api.call-cc.org/doc/",
+               $completer = chickadee_completer);
+/// /Chickadee
+
+// content_policy_bytype_table.object = oni_block_flash;
+cwd = make_file("/home/slash/downloads/");
+hint_digits = "arstdhneio";
+read_buffer_show_icons = true;
+title_format_fn = ext_title_format;
+url_remoting_fn = load_url_in_new_buffer;
+session_auto_save_auto_load = true;
+
+define_key(content_buffer_normal_keymap, "C-x C-b", "switch-to-buffer");
+define_key(content_buffer_normal_keymap, "C-y", "paste-url-new-buffer");
+define_key(content_buffer_normal_keymap, "H", "find-url-from-history");
+define_key(content_buffer_normal_keymap, "h", "find-url-from-history-new-buffer");
+define_key(default_base_keymap, "C-x f", "follow-new-buffer");
+define_key(content_buffer_normal_keymap, "b", clark_keymap);
+define_key(content_buffer_text_keymap, "C-c d", "dispass-and-submit");
+
+add_hook("before_quit_hook", oni_before_quit_func);
+add_hook("content_policy_hook", content_policy_bytype);
+add_hook("mode_line_hook", mode_line_adder(buffer_count_widget));
+add_hook("mode_line_hook", mode_line_adder(buffer_icon_widget), true);
+add_hook("mode_line_hook", mode_line_adder(clark_bookmarked_widget), true);
+add_hook("mode_line_hook", mode_line_adder(downloads_status_widget));
+
+remove_hook("download_added_hook", open_download_buffer_automatically);
+
+hints_minibuffer_annotation_mode(true);
+theme_load("yoshi");
+
+external_content_handlers.set("application/pdf", "zathura");
+external_content_handlers.set("application/vnd.ms-excel", "libreoffice");
+
+var gh_url = "http://github.com/";
+function read_url_github_ad_command_handler(input)
+{
+    var m = /^gh\s+@(\S+)(?:\s+((?:un)?follow))?/.exec(input);
+    if (m) {
+        if (m[2])
+            return gh_url + "users/follow?target=";
+        return gh_url + m[1];
+    }
+
+    return null;
+}
+
+function read_url_github_my_command_handler(input)
+{
+    var m = /^gh\s+my\s+(dashboard|issues|notifications|profile|pulls|stars)/.exec(input);
+
+    if (m) {
+        switch (m[1]) {
+        case "dashboard":
+        case "notifications":
+        case "stars":
+            return gh_url + m[1];
+        case "issues":
+        case "pulls":
+            return gh_url + "dashboard/" + m[1];
+        case "profile":
+            return gh_url + "settings/" + m[1];
+        }
+    }
+
+    return null;
+}
+
+function read_url_github_repo_command_handler(input)
+{
+    var m = /^gh\s+(\S+\/\S+)(?:\s+(\#\d+|\@\S+|issues|pulls|wiki|graphs|network|admin)(?:\s+(\#\d+|new))?)?$/.exec(input);
+
+    if (m) {
+        repo_url = gh_url + m[1] + "/";
+
+        switch (m[2]) {
+        case "issues":
+            issues_url = repo_url + m[2] + "/";
+
+            if (m[3]) {
+                if (m[3][0] == '#')
+                    return issues_url + m[3].substring(1);
+                else if (m[3] == "new")
+                    return issues_url + m[3];
+                else
+                    break;
+            }
+
+            return issues_url;
+        case "pulls":
+        case "wiki":
+        case "graphs":
+        case "network":
+        case "admin":
+            return repo_url + m[2];
+        default:
+            // Still need watch and unwatch
+            if (m[2]) {
+                if (m[2][0] == '#')
+                    return repo_url + "issues/" + m[2].substring(1);
+                else if (m[2][0] == '@')
+                    return repo_url + "tree/" + m[2].substring(1);
+                else
+                    break;
+            }
+
+            return repo_url;
+        }
+    }
+
+    return null;
+}
+
+function read_url_github_command_handler(input)
+{
+    return read_url_github_ad_command_handler(input)
+        || read_url_github_my_command_handler(input)
+        || read_url_github_repo_command_handler(input);
+}
+
+function read_url_local_port_handler(input)
+{
+    var m = /^lh (\d{1,5})(?:\s+([a-zA-Z0-9%/]+))?$/.exec(input),
+        rv = null;
+
+    if (m) {
+        rv = "http://localhost:" + m[1];
+
+        if (m[2])
+            rv += "/" + m[2];
+    }
+
+    return rv;
+}
+
+read_url_handler_list = [read_url_local_port_handler,
+                         read_url_github_command_handler];
+
+// Mozrepl
+let (mozrepl_init = get_home_directory()) {
+    mozrepl_init.appendRelativePath(".mozrepl-conkeror.js");
+    session_pref('extensions.mozrepl.initUrl', make_uri(mozrepl_init).spec);
+};
+
+// if ('@hyperstruct.net/mozlab/mozrepl;1' in Cc) {
+//     let mozrepl = Cc['@hyperstruct.net/mozlab/mozrepl;1']
+//             .getService(Ci.nsIMozRepl);
+//     if (!mozrepl.isActive())
+//         mozrepl.start(4242);
+// }
+
+register_user_stylesheet(
+    "data:text/css," +
+        escape(
+            "@namespace url(\"http://www.w3.org/1999/xhtml\");\n" +
+                "span.__conkeror_hint {\n" +
+                " font-family: \"Envy Code R\" !important;\n" +
+                " font-size: 12px !important;\n" +
+                " line-height: 12px !important;\n" +
+                " padding: 0 2px !important;\n" +
+                "}"
+        )
+);
+
+oni_add_sheet("github.css");
+oni_add_sheet("help.css");
+oni_add_sheet("git-scm.css");
diff --git a/conkeror/.conkerorrc/styles/.gitignore b/conkeror/.conkerorrc/styles/.gitignore
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/conkeror/.conkerorrc/styles/.gitignore
@@ -0,0 +1 @@
+
diff --git a/conkeror/.conkerorrc/styles/base.less b/conkeror/.conkerorrc/styles/base.less
new file mode 100644
index 0000000..410efe2
--- /dev/null
+++ b/conkeror/.conkerorrc/styles/base.less
@@ -0,0 +1,6 @@
+@import "tango";
+@import "yoshi";
+
+@monospace-font: "Envy Code R";
+@background: @dblack;
+@foreground: @lwhite;
diff --git a/conkeror/.conkerorrc/styles/git-scm.less b/conkeror/.conkerorrc/styles/git-scm.less
new file mode 100644
index 0000000..d69a97d
--- /dev/null
+++ b/conkeror/.conkerorrc/styles/git-scm.less
@@ -0,0 +1,18 @@
+@import "base";
+
+@-moz-document domain(git-scm.com) {
+    .book#main {
+        background: @background !important;
+        color: @aluminium-1 !important;
+
+        code, pre {
+            background: @aluminium-6 !important;
+            color: @aluminium-2 !important;
+            font-family: @monospace-font !important;
+        }
+
+        &, code, pre {
+            border: none !important;
+        }
+    }
+}
diff --git a/conkeror/.conkerorrc/styles/github.css b/conkeror/.conkerorrc/styles/github.css
new file mode 100644
index 0000000..961ba4f
--- /dev/null
+++ b/conkeror/.conkerorrc/styles/github.css
@@ -0,0 +1,168 @@
+@-moz-document url("https://github.com/"), url("https://github.com/dashboard") {
+    #dashboard .filter-bar {
+        background:#111111 !important;
+        border-bottom-color:#404040 !important;
+    }
+
+    #dashboard .filter-bar li a.filter_selected {
+        color:#404040 !important;
+    }
+
+    #dashboard .repos {
+        border-color:#404040 !important;
+        background-color:#111111 !important;
+    }
+
+    #dashboard .repos .bottom-bar {
+        background-color:#111111 !important;
+    }
+
+    #dashboard .repos .top-bar {
+        background:#111111 !important;
+        border-bottom-color:#404040 !important;
+    }
+
+    #dashboard .repos h2 {
+        color:inherit !important;
+    }
+
+    #dashboard ul.repo_list li.private {
+        background:#404040 !important;
+    }
+
+    #dashboard ul.repo_list li a {
+        border-width:0 !important;
+    }
+
+    #footer {
+        text-shadow:none !important;
+    }
+
+    .button, .minibutton {
+        background: #111111 !important;
+        color: #bfbfbf !important;
+        text-shadow: none !important;
+        border-color: #404040 !important;
+    }
+
+    .button.primary, .minibutton.primary {
+        background: #111111 !important;
+        color: #bfbfbf !important;
+        border-color: #404040 !important;
+        text-shadow: none;
+    }
+
+    .header {
+        background:#404040 !important;
+        color:#bfbfbf !important;
+        border-bottom-color:#111111 !important;
+        text-shadow:none !important;
+    }
+
+    .header .divider-vertical {
+        background:#111111 !important;
+        border-right-color:#404040 !important;
+    }
+
+    .header .top-nav a,.header .topsearch a#advanced_search,.header #user-links a {
+        color:#bfbfbf !important;
+    }
+
+    .markdown-body code,.markdown-body tt {
+        background-color:#404040 !important;
+        border-color:#111111 !important;
+        color:#bfbfbf !important;
+        font-family:"Inconsolata" !important;
+    }
+
+    .minibutton.dark-grey {
+        backgrond:#404040 !important;
+    }
+
+    .news .alert {
+        border-top-color:#404040 !important;
+    }
+
+    .news .alert .branch-link,
+    .news .alert .pull-info {
+        background:#404040 !important;
+        color:#bfbfbf !important;
+    }
+
+    .news .alert .gravatar {
+        background:none !important;
+    }
+
+    .news .alert .simple .title {
+        color:#bfbfbf !important;
+    }
+
+    .news .commits li img {
+        background:none !important;
+    }
+
+    .news blockquote {
+        color:#bfbfbf !important;
+    }
+
+    .pagehead .container>ul.tabs {
+        background:#111111 !important;
+        border:none !important;
+    }
+
+    .pagehead .container>ul.tabs li a {
+        text-shadow:none !important;
+        border:none !important;
+    }
+
+    .pagehead .container>ul.tabs li a:hover,.pagehead .container>ul.tabs li a.selected {
+        background:#404040 !important;
+    }
+
+    .pagehead-actions a.feed {
+        background:#404040 !important;
+        border:#111111 !important;
+        color:#bfa47d !important;
+    }
+
+    .pagination {
+        background:#404040 !important;
+        border-color:#111111 !important;
+    }
+
+    .pagination a {
+        text-shadow:none !important;
+        border-bottom-color:#404040 !important;
+    }
+
+    .pagination a:hover {
+        background:#111111 !important;
+    }
+
+    a {
+        color:#bfa47d !important;
+    }
+
+    a:visited {
+        color:#b27dbf !important;
+    }
+
+    a.header-logo-blacktocat,a.header-logo-blacktocat:visited {
+        color:#404040 !important;
+    }
+
+    body {
+        background-color:#111111 !important;
+        color:#bfbfbf !important;
+    }
+
+    input[type="text"] {
+        background-color: #404040 !important;
+        color: #bfbfbf !important
+    }
+
+    p.tip,
+    strong.protip {
+        color: #ededed !important;
+    }
+}
diff --git a/conkeror/.conkerorrc/styles/help.less b/conkeror/.conkerorrc/styles/help.less
new file mode 100644
index 0000000..339d7fa
--- /dev/null
+++ b/conkeror/.conkerorrc/styles/help.less
@@ -0,0 +1,21 @@
+@import "base";
+
+@-moz-document url("chrome://conkeror-help/content/help.html") {
+    body {
+        background: @background !important;
+        color: @aluminium-1 !important;
+    }
+
+    a {
+        color: @orange-1 !important;
+
+        &:visited {
+            color: @plum-1 !important;
+        }
+    }
+
+    pre, .key {
+        background: @aluminium-5 !important;
+        font-family: @monospace-font !important;
+    }
+}
diff --git a/conkeror/.conkerorrc/styles/tango.less b/conkeror/.conkerorrc/styles/tango.less
new file mode 100644
index 0000000..ed6858b
--- /dev/null
+++ b/conkeror/.conkerorrc/styles/tango.less
@@ -0,0 +1,27 @@
+@butter-1: #fce94f;
+@butter-2: #edd400;
+@butter-3: #c4a000;
+@orange-1: #fcaf3e;
+@orange-2: #f57900;
+@orange-3: #ce5c00;
+@chocolate-1: #e9b96e;
+@chocolate-2: #c17d11;
+@chocolate-3: #8f5902;
+@chameleon-1: #8ae234;
+@chameleon-2: #73d216;
+@chameleon-3: #4e9a06;
+@sky-blue-1: #729fcf;
+@sky-blue-2: #3465a4;
+@sky-blue-3: #204a87;
+@plum-1: #ad7fa8;
+@plum-2: #75507b;
+@plum-3: #5c3566;
+@scarlet-red-1: #ef2929;
+@scarlet-red-2: #cc0000;
+@scarlet-red-3: #a40000;
+@aluminium-1: #eeeeec;
+@aluminium-2: #d3d7cf;
+@aluminium-3: #babdb6;
+@aluminium-4: #888a85;
+@aluminium-5: #555753;
+@aluminium-6: #2e3436;
diff --git a/conkeror/.conkerorrc/styles/yoshi.less b/conkeror/.conkerorrc/styles/yoshi.less
new file mode 100644
index 0000000..5fdac7e
--- /dev/null
+++ b/conkeror/.conkerorrc/styles/yoshi.less
@@ -0,0 +1,24 @@
+@lblack: #ededed;
+@dblack: #111111;
+@lwhite: #bfbfbf;
+@dwhite: #404040;
+@lred: #bf7d7d;
+@dred: #402929;
+@lorange: #bfa47d;
+@dorange: #403729;
+@lyellow: #b2bf7d;
+@dyellow: #3b4029;
+@lgreen: #8abf6d;
+@dgreen: #2d4029;
+@lturquoise: #7dbf97;
+@dturquoise: #294032;
+@lcyan: #7dbfbf;
+@dcyan: #294040;
+@lblue: #6d97bf;
+@dblue: #293240;
+@lpurple: #8a7dbf;
+@dpurple: #2d2940;
+@lmagenta: #b27dbf;
+@dmagenta: #3b2940;
+@lpink: #bf6da4;
+@dpink: #402937;
diff --git a/conkeror/.conkerorrc/themes/naquadah/conkeror--scrollbars.css b/conkeror/.conkerorrc/themes/naquadah/conkeror--scrollbars.css
new file mode 100644
index 0000000..0f70e96
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/naquadah/conkeror--scrollbars.css
@@ -0,0 +1,36 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* The "background" behind the scrolling part of the scrollbar. */
+scrollbar {
+    background-color: #222;
+}
+
+/* corner between horizontal and vertical scrollbars */
+scrollcorner {
+    background-color: black;
+}
+
+/* The scroll up/down buttons. */
+scrollbarbutton {
+    background-color: #666;
+}
+
+/* The actual scrolling part of the scrollbar. */
+thumb {
+    background-color: #666;
+}
+
+thumb, scrollbarbutton {
+    -moz-border-bottom-colors: #000 #333;
+    -moz-border-left-colors: #aaa #888;
+    -moz-border-right-colors: #000 #333;
+    -moz-border-top-colors: #aaa #888;
+}
+
+scrollbarbutton:hover:active, scrollbarbutton[active="true"] {
+    -moz-border-bottom-colors: #aaa #888;
+    -moz-border-left-colors: #000 #333;
+    -moz-border-right-colors: #aaa #888;
+    -moz-border-top-colors: #000 #333;
+}
diff --git a/conkeror/.conkerorrc/themes/naquadah/hints--url-panel.css b/conkeror/.conkerorrc/themes/naquadah/hints--url-panel.css
new file mode 100644
index 0000000..143f3c1
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/naquadah/hints--url-panel.css
@@ -0,0 +1,17 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.panel {
+  border-top: 4px double #333333;
+  color: white;
+  background-color: black;
+}
+
+.panel .panel-row-label {
+  font-weight: bold;
+}
+
+.panel .url-panel-label {
+  font-weight: bold;
+}
+
diff --git a/conkeror/.conkerorrc/themes/naquadah/minibuffer.css b/conkeror/.conkerorrc/themes/naquadah/minibuffer.css
new file mode 100644
index 0000000..c882f3e
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/naquadah/minibuffer.css
@@ -0,0 +1,52 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#minibuffer {
+    background-color: #252A2E;
+    border: 0px none #444;
+    border-top: 0;
+    color: #EEEEEC;
+    font: 11px Tahoma;
+}
+
+#minibuffer-input, #minibuffer-input * {
+    color: #EEEEEC;
+}
+
+#minibuffer-prompt {
+    color: #EEEEEC;
+}
+
+/* Completions display */
+
+tree.completions treechildren { border: none !important; }
+
+tree.completions treecol { -moz-binding: none !important; }
+tree.completions {
+  -moz-appearance: none !important;
+  border: 0px none !important;
+  border-top: 4px double #333333 !important;
+  background-color: #252A2E !important;
+  -moz-border-top-colors: -moz-initial !important;
+  color: #EEEEEC !important;
+}
+
+tree.completions treechildren::-moz-tree-row {
+  background-color: #252A2E !important;
+  border: none;
+}
+
+tree.completions treechildren::-moz-tree-row(current) {
+  background-color: #0C191C !important;
+  color: #EEEEEC;
+}
+
+tree.completions treechildren::-moz-tree-cell-text(completion-description) {
+  color: green !important;
+  font-weight: bold !important;
+}
+
+tree.completions treechildren::-moz-tree-cell-text(current) {
+  color: #EEEEEC !important;
+}
+
diff --git a/conkeror/.conkerorrc/themes/naquadah/mode-line.css b/conkeror/.conkerorrc/themes/naquadah/mode-line.css
new file mode 100644
index 0000000..7e1ed45
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/naquadah/mode-line.css
@@ -0,0 +1,11 @@
+.mode-line {
+    font: 11px Tahoma;
+    padding: 0px;
+    border: 1px solid #2E3436;
+    color: #EEEEEC;
+    background-color: #0C191C;
+}
+
+.mode-line label {
+    color: #EEEEEC;
+}
diff --git a/conkeror/.conkerorrc/themes/naquadah/new-tabs.css b/conkeror/.conkerorrc/themes/naquadah/new-tabs.css
new file mode 100644
index 0000000..f5d30c0
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/naquadah/new-tabs.css
@@ -0,0 +1,54 @@
+#tab2-bar {
+    background: #222;
+}
+
+.tab2 {
+    margin: 2px 0px 0px 2px;
+    padding: 0px;
+    height: 22px;
+    border-width: 2px;
+    border-bottom-width: 0;
+    border-style: solid;
+    -moz-border-radius: 3px 3px 0 0;
+    -moz-border-left-colors: #888 #555;
+    -moz-border-right-colors: #000 #171717;
+    -moz-border-top-colors: #888 #555;
+    background: #333;
+    min-width: 200px;
+    max-width: 200px;
+    overflow: hidden; /* Chops end of label */
+}
+
+.tab2[selected=true] {
+    -moz-border-left-colors: #aaa #888;
+    -moz-border-right-colors: #000 #333;
+    -moz-border-top-colors: #aaa #888;
+    background: #666;
+}
+
+.tab2:hover {
+    -moz-border-left-colors: #eee #bbb;
+    -moz-border-right-colors: #333 #666;
+    -moz-border-top-colors: #eee #bbb;
+    background: #999;
+}
+
+.tab2-label {
+    margin-left: 4px;
+    padding-top: 1px;
+    color: #fff;
+    font: 11px Tahoma;
+}
+
+.tab2-icon {
+    margin: 1px !important;
+    padding: 1px;
+    width: 20px;
+    height: 15px;
+    max-height: 15px;
+    -moz-border-radius: 1px;
+    background: black;
+    color: white;
+    font: 900 11px Tahoma;
+    text-align: center;
+}
diff --git a/conkeror/.conkerorrc/themes/naquadah/tab-bar.css b/conkeror/.conkerorrc/themes/naquadah/tab-bar.css
new file mode 100644
index 0000000..c451778
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/naquadah/tab-bar.css
@@ -0,0 +1,41 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* TABS */
+#tab2-bar {
+    background: #000;
+}
+
+#tab2-bar .tab2 {
+    margin: 0;
+    padding: 0;
+    border: none;
+    /*height: 19px;
+    border: 1px solid #666;
+    min-width: 200px;
+    max-width: 200px;*/
+    background: #333;
+    overflow: hidden;
+}
+
+#tab2-bar .tab2-label {
+    margin: 0;
+    color: white;
+    font: 11px Tahoma;
+}
+
+#tab2-bar .tab2-icon {
+    height: 16px;
+    width: 16px;
+    background: #222;
+    color: white;
+    border: 1px solid #999;
+    font: 900 11px Tahoma;
+    text-align: center;
+}
+
+#tab2-bar .tab2[selected=true] {
+    border: 1px solid white;
+    background: #666;
+    border: 1px solid #999;
+}
diff --git a/conkeror/.conkerorrc/themes/naquadah/theme.json b/conkeror/.conkerorrc/themes/naquadah/theme.json
new file mode 100644
index 0000000..bb74ee1
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/naquadah/theme.json
@@ -0,0 +1,9 @@
+{ "sheets" : [
+    "conkeror--scrollbars.css",
+    "new-tabs.css",
+    "minibuffer.css",
+    "mode-line.css",
+    "hints--url-panel.css",
+    "tab-bar.css"
+  ]
+}
diff --git a/conkeror/.conkerorrc/themes/yoshi/conkeror--scrollbars.css b/conkeror/.conkerorrc/themes/yoshi/conkeror--scrollbars.css
new file mode 100644
index 0000000..0f70e96
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/yoshi/conkeror--scrollbars.css
@@ -0,0 +1,36 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* The "background" behind the scrolling part of the scrollbar. */
+scrollbar {
+    background-color: #222;
+}
+
+/* corner between horizontal and vertical scrollbars */
+scrollcorner {
+    background-color: black;
+}
+
+/* The scroll up/down buttons. */
+scrollbarbutton {
+    background-color: #666;
+}
+
+/* The actual scrolling part of the scrollbar. */
+thumb {
+    background-color: #666;
+}
+
+thumb, scrollbarbutton {
+    -moz-border-bottom-colors: #000 #333;
+    -moz-border-left-colors: #aaa #888;
+    -moz-border-right-colors: #000 #333;
+    -moz-border-top-colors: #aaa #888;
+}
+
+scrollbarbutton:hover:active, scrollbarbutton[active="true"] {
+    -moz-border-bottom-colors: #aaa #888;
+    -moz-border-left-colors: #000 #333;
+    -moz-border-right-colors: #aaa #888;
+    -moz-border-top-colors: #000 #333;
+}
diff --git a/conkeror/.conkerorrc/themes/yoshi/hints--url-panel.css b/conkeror/.conkerorrc/themes/yoshi/hints--url-panel.css
new file mode 100644
index 0000000..143f3c1
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/yoshi/hints--url-panel.css
@@ -0,0 +1,17 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.panel {
+  border-top: 4px double #333333;
+  color: white;
+  background-color: black;
+}
+
+.panel .panel-row-label {
+  font-weight: bold;
+}
+
+.panel .url-panel-label {
+  font-weight: bold;
+}
+
diff --git a/conkeror/.conkerorrc/themes/yoshi/minibuffer.css b/conkeror/.conkerorrc/themes/yoshi/minibuffer.css
new file mode 100644
index 0000000..12ca4e8
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/yoshi/minibuffer.css
@@ -0,0 +1,49 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#minibuffer {
+    background-color: #111113;
+    border: none;
+    color: #EEEEEC;
+    font: 16px "Envy Code R";
+}
+
+#minibuffer-input, #minibuffer-input * {
+    color: #EEEEEC;
+}
+
+#minibuffer-prompt {
+    color: #EEEEEC;
+}
+
+/* Completions display */
+
+tree.completions treechildren { border: none !important; }
+
+tree.completions treecol { -moz-binding: none !important; }
+tree.completions {
+  -moz-appearance: none !important;
+  border: 0px none !important;
+  background-color: #111113 !important;
+  -moz-border-top-colors: -moz-initial !important;
+  color: #EEEEEC !important;
+  font: 18px "Envy Code R";
+}
+
+tree.completions treechildren::-moz-tree-row {
+  background-color: #111113 !important;
+  border: none;
+}
+
+tree.completions treechildren::-moz-tree-row(current) {
+  background-color: #536580 !important;
+  color: #EEEEEC;
+}
+
+tree.completions treechildren::-moz-tree-cell-text(completion-description) {
+  color: #b8ffa6 !important;
+}
+
+tree.completions treechildren::-moz-tree-cell-text(current) {
+  color: #EEEEEC !important;
+}
diff --git a/conkeror/.conkerorrc/themes/yoshi/mode-line.css b/conkeror/.conkerorrc/themes/yoshi/mode-line.css
new file mode 100644
index 0000000..31aabd7
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/yoshi/mode-line.css
@@ -0,0 +1,11 @@
+.mode-line {
+    font: 16px "Envy Code R";
+    padding: 0px;
+    border: none;
+    color: #EEEEEC;
+    background-color: #222224;
+}
+
+.mode-line label {
+    color: #EEEEEC;
+}
diff --git a/conkeror/.conkerorrc/themes/yoshi/new-tabs.css b/conkeror/.conkerorrc/themes/yoshi/new-tabs.css
new file mode 100644
index 0000000..f5d30c0
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/yoshi/new-tabs.css
@@ -0,0 +1,54 @@
+#tab2-bar {
+    background: #222;
+}
+
+.tab2 {
+    margin: 2px 0px 0px 2px;
+    padding: 0px;
+    height: 22px;
+    border-width: 2px;
+    border-bottom-width: 0;
+    border-style: solid;
+    -moz-border-radius: 3px 3px 0 0;
+    -moz-border-left-colors: #888 #555;
+    -moz-border-right-colors: #000 #171717;
+    -moz-border-top-colors: #888 #555;
+    background: #333;
+    min-width: 200px;
+    max-width: 200px;
+    overflow: hidden; /* Chops end of label */
+}
+
+.tab2[selected=true] {
+    -moz-border-left-colors: #aaa #888;
+    -moz-border-right-colors: #000 #333;
+    -moz-border-top-colors: #aaa #888;
+    background: #666;
+}
+
+.tab2:hover {
+    -moz-border-left-colors: #eee #bbb;
+    -moz-border-right-colors: #333 #666;
+    -moz-border-top-colors: #eee #bbb;
+    background: #999;
+}
+
+.tab2-label {
+    margin-left: 4px;
+    padding-top: 1px;
+    color: #fff;
+    font: 11px Tahoma;
+}
+
+.tab2-icon {
+    margin: 1px !important;
+    padding: 1px;
+    width: 20px;
+    height: 15px;
+    max-height: 15px;
+    -moz-border-radius: 1px;
+    background: black;
+    color: white;
+    font: 900 11px Tahoma;
+    text-align: center;
+}
diff --git a/conkeror/.conkerorrc/themes/yoshi/tab-bar.css b/conkeror/.conkerorrc/themes/yoshi/tab-bar.css
new file mode 100644
index 0000000..c451778
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/yoshi/tab-bar.css
@@ -0,0 +1,41 @@
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* TABS */
+#tab2-bar {
+    background: #000;
+}
+
+#tab2-bar .tab2 {
+    margin: 0;
+    padding: 0;
+    border: none;
+    /*height: 19px;
+    border: 1px solid #666;
+    min-width: 200px;
+    max-width: 200px;*/
+    background: #333;
+    overflow: hidden;
+}
+
+#tab2-bar .tab2-label {
+    margin: 0;
+    color: white;
+    font: 11px Tahoma;
+}
+
+#tab2-bar .tab2-icon {
+    height: 16px;
+    width: 16px;
+    background: #222;
+    color: white;
+    border: 1px solid #999;
+    font: 900 11px Tahoma;
+    text-align: center;
+}
+
+#tab2-bar .tab2[selected=true] {
+    border: 1px solid white;
+    background: #666;
+    border: 1px solid #999;
+}
diff --git a/conkeror/.conkerorrc/themes/yoshi/theme.json b/conkeror/.conkerorrc/themes/yoshi/theme.json
new file mode 100644
index 0000000..bb74ee1
--- /dev/null
+++ b/conkeror/.conkerorrc/themes/yoshi/theme.json
@@ -0,0 +1,9 @@
+{ "sheets" : [
+    "conkeror--scrollbars.css",
+    "new-tabs.css",
+    "minibuffer.css",
+    "mode-line.css",
+    "hints--url-panel.css",
+    "tab-bar.css"
+  ]
+}