diff --git a/Encyclopedia/__init__.py b/Encyclopedia/__init__.py
index 52ca9eb..b9f6615 100644
--- a/Encyclopedia/__init__.py
+++ b/Encyclopedia/__init__.py
@@ -20,7 +20,7 @@ funtionality
 import supybot
 import supybot.world as world
 
-__version__ = "2.1"
+__version__ = "2.2"
 __author__ = supybot.Author("Dennis Kaarsemaker","Seveas","dennis@kaarsemaker.net")
 __contributors__ = {}
 __url__ = 'https://bots.ubuntulinux.nl'
diff --git a/Encyclopedia/factoids.cgi b/Encyclopedia/factoids.cgi
index 863628a..931b4ee 100755
--- a/Encyclopedia/factoids.cgi
+++ b/Encyclopedia/factoids.cgi
@@ -14,7 +14,7 @@
 ###
 
 import sys
-sys.path.append('/var/www/bots.ubuntulinux.nl')
+sys.path.append('/var/www/ubotu.ubuntu-nl.org')
 from commoncgi import *
 
 ### Variables
diff --git a/Encyclopedia/factoids.tmpl b/Encyclopedia/factoids.tmpl
index 62dc876..ef98afb 100644
--- a/Encyclopedia/factoids.tmpl
+++ b/Encyclopedia/factoids.tmpl
@@ -2,91 +2,8 @@
 <head>
 <title>Ubotu factoids</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-</head>
-<style type="text/css">
-body {
-  font-family: verdana, sans;
-  font-weight: bold;
-  background-color: #d9bb7a;
-  color: #980101;
-  font-size: 10px;
-}
-.submit {
-  font-size: 10px;
-  border: solid 1px #980101;
-  color: #980101;
-  font-weight: bold;
-  background-color: #fdff99;
-}
-.input {
-  font-size: 10px;
-  border: solid 1px #980101;
-  color: #980101;
-  font-weight: bold;
-  background-color: white;
-}
-th {
-  font-size: 10px;
-  border-bottom: solid 1px #980101;
-  text-align: center;
-}
-td,th {
-  font-size: 10px;
-  text-align: left;
-  vertical-align: top;
-}
-td.comment {
-  white-space: normal;
-  padding-left: 20px;
-}
-li {
-  list-style: none;
-}
-table {
-  width: 100%%;
-  padding-top: 1em;
-  clear: both;
-}
-
-div.main {
-  margin: 20px;
-  border: 2px solid #980101;
-  padding: 0px;
-  background-color: #fdd99b;
-  text-align: center;
-}
-div.pdata {
-  text-align: right;
-  padding-right: 10px;
-  float: right;
-}
-div.search {
-  float: left;
-  text-align: left;
-  padding-left: 10px;
-}
-a, span.pseudolink {
-  color: #d40000;
-  text-decoration: underline;
-  cursor: pointer;
-}
-span.removal {
-  color: #6699cc;
-}
-tr.bg2 {
-  background-color: #fdff99;
-}
-div.invisible {
-  display: none;
-}
-div.log {
-  display: none;
-  color: black;
-  width: 100%%;
-  font-family: monospace;
-  white-space: normal;
-}
-</style>
+    <link rel="stylesheet" href="/bot.css" />
+    <link rel="shortcut icon" href="favicon.ico" type="image/png" />
 <script type="text/javascript">
   var DHTML = (document.getElementById || document.all || document.layers);
   
@@ -120,6 +37,7 @@ div.log {
 
   }
 </script>
+</head>
 <body>
 <div class="main">
 <h1>Ubotu factoids</h1>
@@ -127,6 +45,7 @@ div.log {
 More help: <a href="http://wiki.ubuntu.com/">wiki.ubuntu.com</a> &middot;
 <a href="http://help.ubuntu.com/">help.ubuntu.com</a><br />
 More factoids: <a href="factoids.cgi?db=ubuntu">Ubuntu</a> &middot;
+<a href="factoids.cgi?db=falcon">Falcon</a> &middot;
 <a href="factoids.cgi?db=buntudot">buntudot</a> &middot;
 <a href="factoids.cgi?db=gnewsense">GNewSense</a><br />
 <form action="/factoids.cgi" method="GET"><input class="input" type="text" name="search" />
@@ -137,6 +56,7 @@ More factoids: <a href="factoids.cgi?db=ubuntu">Ubuntu</a> &middot;
 <p>
 <a href="ubuntu.db">Ubuntu factoid database file</a><br />
 <a href="buntudot.db">Buntudot factoid database file</a><br />
+<a href="falcon.db">Falcon factoid database file</a><br />
 <a href="gnewsense.db">GNewSense factoid database file</a><br />
 &copy;2006 Dennis Kaarsemaker
 </p>
diff --git a/bot.css b/bot.css
index 23daa02..403528e 100644
--- a/bot.css
+++ b/bot.css
@@ -1,42 +1,41 @@
 body {
   font-family: verdana, sans;
   font-weight: bold;
-  background-color: #d9bb7a;
-  color: #980101;
+  background-color: #eeeeee;
+  color: #000066;
   font-size: 10px;
 }
 
 div.home {
   margin: 20px auto;
   width: 300px;
-  border: 2px solid #980101;
+  border: 2px solid #000066;
   padding: 0px 10px;
-  background-color: #fdd99b;
+  background-color: #ffffff;
   text-align: center;
 }
 .submit {
   font-size: 10px;
-  border: solid 1px #980101;
-  color: #980101;
+  border: solid 1px #000066;
+  color: #000066;
   font-weight: bold;
-  background-color: #fdff99;
+  background-color: #eeeeee;
 }
 .input {
   font-size: 10px;
-  border: solid 1px #980101;
-  color: #980101;
+  border: solid 1px #000066;
+  color: #000066;
   font-weight: bold;
   background-color: white;
 }
 th {
-  border-bottom: solid 1px #980101;
+  border-bottom: solid 1px #000066;
   text-align: center;
 }
 td,th {
   font-size: 10px;
   text-align: left;
   vertical-align: top;
-  white-space: nowrap;
 }
 td.comment {
   white-space: normal;
@@ -53,9 +52,9 @@ table {
 
 div.main {
   margin: 20px;
-  border: 2px solid #980101;
+  border: 2px solid #000066;
   padding: 0px;
-  background-color: #fdd99b;
+  background-color: #ffffff;
   text-align: center;
 }
 div.pdata {
@@ -69,7 +68,7 @@ div.search {
   padding-left: 10px;
 }
 a, span.pseudolink {
-  color: #d40000;
+  color: #0000ff;
   text-decoration: underline;
   cursor: pointer;
 }
@@ -77,7 +76,7 @@ span.removal {
   color: #6699cc;
 }
 tr.bg2 {
-  background-color: #fdff99;
+  background-color: #eeeeee;
 }
 div.invisible {
   display: none;
diff --git a/index.html b/index.html
index 51a3563..9c6401d 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
     <div class="home">
       <h1>Ubugtu &amp; Ubotu <img src="xchat.png" alt="Hi!" /></h1>
       <p>
-        This is the home of the and Ubotu bot which you can find in various
+        This is the home of the Ubotu bot which you can find in various
         Ubuntu channels on the Freenode network. If you want him to join your
         channel: /msg Seveas
       </p>
@@ -24,7 +24,7 @@
       </p>
       <h1>Web interface</h1>
       <p><a href="timezones.html">Timezones</a></p>
-      <p><a href="https://bots.ubuntulinux.nl/bans.cgi">The bantracker</a></p>
+      <p><a href="https://ubotu.ubuntu-nl.org/bans.cgi">The bantracker</a></p>
       <p><a href="factoids.cgi">Factoid database</a></p>
       <h1>Raw data</h1>
       <p><a href="ubuntu.db">Ubuntu database</a></p>
