diff --git a/favicon.ico b/favicon.ico
deleted file mode 100644
index 1da8222..0000000
Binary files a/favicon.ico and /dev/null differ
diff --git a/favicon.ico b/favicon.ico
new file mode 120000
index 0000000..f5ec2cb
--- /dev/null
+++ b/favicon.ico
@@ -0,0 +1 @@
+favicon_bear.ico
\ No newline at end of file
diff --git a/favicon_bear.ico b/favicon_bear.ico
new file mode 100644
index 0000000..a29e2d6
Binary files /dev/null and b/favicon_bear.ico differ
diff --git a/favicon_crow.ico b/favicon_crow.ico
new file mode 100644
index 0000000..1da8222
Binary files /dev/null and b/favicon_crow.ico differ

diff --git a/scriptbottom.sxhtml b/scriptbottom.sxhtml
index 7b5b19b..309b00f 100644
--- a/scriptbottom.sxhtml
+++ b/scriptbottom.sxhtml
@@ -9,7 +9,7 @@ var disqus_identifier = '23tkjs2qwe7jhaf';
    dsq.async = true;
    //dsq.src = 'http://mediacdn.disqus.com/1012/build/loader.js';
    dsq.src = 'http://simonsplace.disqus.com/embed.js';
-   //dsq.src = 'http://simonraven.kisikew.org/js/disqusloader.js';
+   //dsq.src = 'http://simonraven.kisikew.org/media/js/disqusloader.js';
    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
 })();
 /* ]]> */
diff --git a/scripttop.sxhtml b/scripttop.sxhtml
index eebf92e..9213fab 100644
--- a/scripttop.sxhtml
+++ b/scripttop.sxhtml
@@ -9,7 +9,7 @@ _gaq.push(['_trackPageview']);
     ga.type = 'text/javascript';
     ga.async = true;
     //ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    ga.src = "/js/ga.js";
+    ga.src = "/media/js/ga.js";
     (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
 })();
 /*]]>*/

diff --git a/pagetopextras.sxhtml b/pagetopextras.sxhtml
index ca2d042..c9efa89 100644
--- a/pagetopextras.sxhtml
+++ b/pagetopextras.sxhtml
@@ -3,19 +3,17 @@
 
 <link rel="alternate" href="http://simonraven.kisikew.org/rss/index.rss" title="Simon's Place RSS Feed" type="application/rss+xml" />
 <link rel="alternate" href="http://simonraven.kisikew.org/atom/index.atom" title="Simon's Place Atom Feed" type="application/atom+xml" />
-<link rel="alternate" href="http://simonraven.kisikew.org/blog/rss/index.rss" title="Simon's BRant RSS Feed" type="application/rss+xml" />
-<link rel="alternate" href="http://simonraven.kisikew.org/blog/atom/index.atom" title="Simon's BRant Atom Feed" type="application/atom+xml" />
 
 <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" />
 <!-- blueprint-css github ==> blueprint-css -->
 <!-- put this stuff first, as we reset things to our stuff after -->
-<link rel="stylesheet" type="text/css" media="print" href="http://www.kisikew.org/css/blueprint/print.css" />
+<link rel="stylesheet" type="text/css" media="print" href="http://www.kisikew.org/media/css/blueprint/print.css" />
 <!--[if lt IE 8]>
-<link rel="stylesheet" type="text/css" media="screen, projection" href="http://www.kisikew.org/css/blueprint/ie.css" />
+<link rel="stylesheet" type="text/css" media="screen, projection" href="http://www.kisikew.org/media/css/blueprint/ie.css" />
 <![endif]-->
 <!-- bpl is local blueprint mods -->
-<link rel="stylesheet" href="/reset.css" type="text/css" media="screen, projection" />
-<link rel="stylesheet" href="/typography.css" type="text/css" media="screen, projection" />
+<link rel="stylesheet" href="/media/css/reset.css" type="text/css" media="screen, projection" />
+<link rel="stylesheet" href="/media/css/typography.css" type="text/css" media="screen, projection" />
 <!-- /blueprint-css -->
 
 <link rel="openid.server" href="http://www.myopenid.com/server" />
@@ -25,20 +23,20 @@
      depends on the former to function. -->
 <!-- we may not need to do this with HTML5 anymore, but we may continue
      to use this for backwards compatibility -->
-<script type="text/javascript" src="/js/xdocwrite.js"></script>
-<script type="text/javascript" src="/js/jquery.js"></script>
-<script type="text/javascript" src="/js/jquery.svg.js"></script>
-<style type="text/css">@import "/js/jquery.svg.css";</style>
-<script type="text/javascript" src="/js/jquery.svganim.min.js"></script>
-<script type="text/javascript" src="/js/jquery.svgdom.min.js"></script>
-<script type="text/javascript" src="/js/jquery.svgfilter.min.js"></script>
-<script type="text/javascript" src="/js/jquery.svggraph.min.js"></script>
-<script type="text/javascript" src="/js/jquery.svgplot.min.js"></script>
-<!--script type="text/javascript" src="/js/jquery-ui.min.js"></script-->
-<!--script type="text/javascript" src="/js/ui/jquery-ui-i18n.min.js"></script-->
-<!--script type="text/javascript" src="/js/prototype.js"></script-->
-<!--script type="text/javascript" src="/js/plugins/jquery.easydrag.js"></script-->
-<script type="text/javascript" src="/js/greybox.js"></script>
+<script type="text/javascript" src="/media/js/xdocwrite.js"></script>
+<script type="text/javascript" src="/media/js/jquery.js"></script>
+<script type="text/javascript" src="/media/js/jquery.svg.js"></script>
+<style type="text/css">@import "/media/js/jquery.svg.css";</style>
+<script type="text/javascript" src="/media/js/jquery.svganim.min.js"></script>
+<script type="text/javascript" src="/media/js/jquery.svgdom.min.js"></script>
+<script type="text/javascript" src="/media/js/jquery.svgfilter.min.js"></script>
+<script type="text/javascript" src="/media/js/jquery.svggraph.min.js"></script>
+<script type="text/javascript" src="/media/js/jquery.svgplot.min.js"></script>
+<!--script type="text/javascript" src="/media/js/jquery-ui.min.js"></script-->
+<!--script type="text/javascript" src="/media/js/ui/jquery-ui-i18n.min.js"></script-->
+<!--script type="text/javascript" src="/media/js/prototype.js"></script-->
+<!--script type="text/javascript" src="/media/js/plugins/jquery.easydrag.js"></script-->
+<script type="text/javascript" src="/media/js/greybox.js"></script>
 <!-- WMD -->
 <link rel="stylesheet" type="text/css" href="/wmd/wmd.css" />
 <script type="text/javascript" src="/wmd/showdown.js"></script>
@@ -49,6 +47,6 @@
     for IE in my stuff. This is a first for me. It's a hack, but works.
 -->
 <!--[if IE]>
-<script type="text/javascript" src="/js/html5shiv/html5.js"></script>
+<script type="text/javascript" src="/media/js/html5shiv/html5.js"></script>
 <![endif]-->
-<script type="text/javascript" src="/js/global.js"></script>
+<script type="text/javascript" src="/media/js/global.js"></script>

diff --git a/Contact.mdwn b/Contact.mdwn
index be2f6a3..274c362 100644
--- a/Contact.mdwn
+++ b/Contact.mdwn
@@ -1,6 +1,6 @@
 [[!meta title="Contact"]]
 
-![pic](/imgs/s.r-gmail_com.png "manual Captcha, like it?")
+![pic](/media/img/s.r-gmail_com.png "manual Captcha, like it?")
 
 <!--
 simon<br />
diff --git a/Documentation/macppc/adbkeycodes.mdwn b/Documentation/macppc/adbkeycodes.mdwn
index 53f863f..70ed9e0 100644
--- a/Documentation/macppc/adbkeycodes.mdwn
+++ b/Documentation/macppc/adbkeycodes.mdwn
@@ -8,7 +8,7 @@ In Linux-based OSes, Option get mapped out to <Alt> and the Command key ge
 
 
 <p style="background-color: #eeeeee;">
-<img alt="Option key" title="Option key" src="http://simonraven.kisikew.org/imgs/icons/option.png" /> -- option key symbol<br />
-<img alt="Command key" title="Command key" src="http://simonraven.kisikew.org/imgs/icons/command.png" /> -- command key symbol<br />
-<img alt="ADB keys" title="ADB keys" src="http://simonraven.kisikew.org/imgs/a/adbkeys.png" /> -- ADB keycodes and Linux Input Layer"
+<img alt="Option key" title="Option key" src="http://simonraven.kisikew.org/media/img/icons/option.png" /> -- option key symbol<br />
+<img alt="Command key" title="Command key" src="http://simonraven.kisikew.org/media/img/icons/command.png" /> -- command key symbol<br />
+<img alt="ADB keys" title="ADB keys" src="http://simonraven.kisikew.org/media/img/a/adbkeys.png" /> -- ADB keycodes and Linux Input Layer"
 </p>
diff --git a/local.css b/local.css
index fd89ab8..fc02829 100644
--- a/local.css
+++ b/local.css
@@ -127,7 +127,7 @@ margin:0 auto 10px 5em;
 width:70%;
 }
 .footerhr {
-background:transparent url(http://simonraven.kisikew.org/imgs/f/feather.svg) no-repeat;
+background:transparent url(http://simonraven.kisikew.org/media/img/f/feather.svg) no-repeat;
 background-size:100% 100%;
 border:0;
 height:46px;
diff --git a/local_dark.css b/local_dark.css
index d148e1f..9ab0fcc 100644
--- a/local_dark.css
+++ b/local_dark.css
@@ -55,7 +55,7 @@ width:70%;
 }
 
 .footerhr {
-background:transparent url(http://simonraven.kisikew.org/imgs/f/feather.svg) no-repeat;
+background:transparent url(http://simonraven.kisikew.org/media/img/f/feather.svg) no-repeat;
 background-size:100% 100%;
 border:0;
 height:46px;

diff --git a/categories/11th_hour.mdwn b/categories/11th_hour.mdwn
deleted file mode 100644
index 594d13f..0000000
--- a/categories/11th_hour.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag 11th_hour"]]
-
-[[!inline pages="tagged(11th_hour)" actions="no" archive="yes"]]
diff --git a/categories/14_june.mdwn b/categories/14_june.mdwn
deleted file mode 100644
index 84a0a85..0000000
--- a/categories/14_june.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag 14_june"]]
-
-[[!inline pages="tagged(14_june)" actions="no" archive="yes"]]
diff --git a/categories/2007.mdwn b/categories/2007.mdwn
deleted file mode 100644
index 21132dc..0000000
--- a/categories/2007.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag 2007"]]
-
-[[!inline pages="tagged(2007)" actions="no" archive="yes"]]
diff --git a/categories/2008.mdwn b/categories/2008.mdwn
deleted file mode 100644
index 125cd9e..0000000
--- a/categories/2008.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag 2008"]]
-
-[[!inline pages="tagged(2008)" actions="no" archive="yes"]]
diff --git a/categories/2010.mdwn b/categories/2010.mdwn
deleted file mode 100644
index e78fcd4..0000000
--- a/categories/2010.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag 2010"]]
-
-[[!inline pages="tagged(2010)" actions="no" archive="yes"]]
diff --git a/categories/250000_years.mdwn b/categories/250000_years.mdwn
deleted file mode 100644
index a7b63ec..0000000
--- a/categories/250000_years.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag 250000_years"]]
-
-[[!inline pages="tagged(250000_years)" actions="no" archive="yes"]]
diff --git a/categories/26_million.mdwn b/categories/26_million.mdwn
deleted file mode 100644
index 181d3e2..0000000
--- a/categories/26_million.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag 26_million"]]
-
-[[!inline pages="tagged(26_million)" actions="no" archive="yes"]]
diff --git a/categories/28_august.mdwn b/categories/28_august.mdwn
deleted file mode 100644
index 63e1a55..0000000
--- a/categories/28_august.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag 28_august"]]
-
-[[!inline pages="tagged(28_august)" actions="no" archive="yes"]]
diff --git a/categories/2x4.mdwn b/categories/2x4.mdwn
deleted file mode 100644
index 7cb99ab..0000000
--- a/categories/2x4.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag 2x4"]]
-
-[[!inline pages="tagged(2x4)" actions="no" archive="yes"]]
diff --git a/categories/401.mdwn b/categories/401.mdwn
deleted file mode 100644
index 3f4bcc8..0000000
--- a/categories/401.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag 401"]]
-
-[[!inline pages="tagged(401)" actions="no" archive="yes"]]
diff --git a/categories/40th_anniversary.mdwn b/categories/40th_anniversary.mdwn
deleted file mode 100644
index 2a989c6..0000000
--- a/categories/40th_anniversary.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag 40th_anniversary"]]
-
-[[!inline pages="tagged(40th_anniversary)" actions="no" archive="yes"]]
diff --git a/categories/Art_forms.mdwn b/categories/Art_forms.mdwn
deleted file mode 100644
index b2b4340..0000000
--- a/categories/Art_forms.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag Art-forms"]]
-
-[[!inline pages="tagged(Art-forms)" actions="no" archive="yes"]]
diff --git a/categories/Articles.mdwn b/categories/Articles.mdwn
deleted file mode 100644
index 499536c..0000000
--- a/categories/Articles.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Here are posts tagged with "Articles".
-
-[[!inline pages="tagged(categories/Articles) and /blog/posts/* and !*/discussion" show="10" actions="no" archive="yes"]]
-
diff --git a/categories/Comedy.mdwn b/categories/Comedy.mdwn
deleted file mode 100644
index bc05946..0000000
--- a/categories/Comedy.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Here are posts tagged with "Comedy".
-
-[[!inline pages="tagged(categories/Comedy) and /blog/posts/* and !*/discussion" show="10" actions="no" archive="yes"]]
-
diff --git a/categories/Events.mdwn b/categories/Events.mdwn
deleted file mode 100644
index 505adfd..0000000
--- a/categories/Events.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Here are posts tagged with "Events".
-
-[[!inline pages="tagged(categories/Events) and /blog/posts/* and !*/discussion" show="10" actions="no" archive="yes"]]
-
diff --git a/categories/Free_Software.mdwn b/categories/Free_Software.mdwn
deleted file mode 100644
index 607ea12..0000000
--- a/categories/Free_Software.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag Free-Software"]]
-
-[[!inline pages="tagged(Free-Software)" actions="no" archive="yes"]]
diff --git a/categories/General.mdwn b/categories/General.mdwn
deleted file mode 100644
index 2bbd5f7..0000000
--- a/categories/General.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Here are posts tagged with "General".
-
-[[!inline pages="tagged(categories/General) and /blog/posts/* and !*/discussion" show="10" actions="no" archive="yes"]]
-
diff --git a/categories/Health.mdwn b/categories/Health.mdwn
deleted file mode 100644
index 0148caa..0000000
--- a/categories/Health.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Here are posts tagged with "Health".
-
-[[!inline pages="tagged(categories/Health) and /blog/posts/* and !*/discussion" show="10" actions="no" archive="yes"]]
-
diff --git a/categories/Hueyatlaco.mdwn b/categories/Hueyatlaco.mdwn
deleted file mode 100644
index 64c3a1b..0000000
--- a/categories/Hueyatlaco.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag Hueyatlaco"]]
-
-[[!inline pages="tagged(Hueyatlaco)" actions="no" archive="yes"]]
diff --git a/categories/Human_Rights.mdwn b/categories/Human_Rights.mdwn
deleted file mode 100644
index 35cc89a..0000000
--- a/categories/Human_Rights.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="tag Human-Rights"]]
-
-[[!inline pages="tagged(Human-Rights)" actions="no" archive="yes"]]
diff --git a/categories/IEN.mdwn b/categories/IEN.mdwn
deleted file mode 100644
index fdf320d..0000000
--- a/categories/IEN.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-Here are posts tagged with "IEN".
-
-[[!inline pages="tagged(categories/IEN) and /blog/posts/* and !*/discussion" show="10" actions="no" archive="yes"]]
-
diff --git a/categories/Indigenous.mdwn b/categories/Indigenous.mdwn
deleted file mode 100644
index 787f6c2..0000000
--- a/categories/Indigenous.mdwn
+++ /dev/null

(Diff truncated)