diff --git a/alchemy/static/js/libs/jquery.min.js b/alchemy/static/js/jquery.min.js
similarity index 100%
rename from alchemy/static/js/libs/jquery.min.js
rename to alchemy/static/js/jquery.min.js
diff --git a/alchemy/templates/base.html b/alchemy/templates/base.html
index 441d294..30bc5ad 100644
--- a/alchemy/templates/base.html
+++ b/alchemy/templates/base.html
@@ -1,37 +1,51 @@
-
- {% block head %}
-
-
-
+
+ {% block head %}
+
+
+
- {% block title %}{{ SITE_SUBTEXT }}{% endblock title %}
+ {% block title %}{{ SITE_SUBTEXT }}{% endblock title %}
- {% include "include/favicon.html" %}
- {% include "include/feeds.html" %}
-
+ {% if EXTRA_FAVICON %}
+
+
+
+
+
+ {% endif %}
-
- {% include "include/google_analytics.html" %}
- {% endblock %}
-
+ {% if FEED_ATOM %}
+
+ {% endif %}
+ {% if FEED_RSS %}
+
+ {% endif %}
-
- {% include "include/header.html" %}
-
- {% block content %}{% endblock %}
-
- {% include "include/footer.html" %}
+
-
-
-
+
+
+ {% include "include/google_analytics.html" %}
+ {% endblock %}
+
+
+
+ {% include "include/header.html" %}
+
+ {% block content %}{% endblock %}
+
+ {% include "include/footer.html" %}
+
+
+
+
diff --git a/alchemy/templates/include/favicon.html b/alchemy/templates/include/favicon.html
deleted file mode 100644
index 50a0826..0000000
--- a/alchemy/templates/include/favicon.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% if EXTRA_FAVICON %}
-
-
-
-
-
-{% endif %}
diff --git a/alchemy/templates/include/feeds.html b/alchemy/templates/include/feeds.html
deleted file mode 100644
index 85403e5..0000000
--- a/alchemy/templates/include/feeds.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% if FEED_ATOM %}
-
-{% endif %}
-{% if FEED_RSS %}
-
-{% endif %}