diff --git a/_sakura/components/Database.php b/_sakura/components/Database.php
index 4e3b52b..c94a557 100644
--- a/_sakura/components/Database.php
+++ b/_sakura/components/Database.php
@@ -14,7 +14,7 @@ class Database {
     public static function init($engine) {
 
         // Make the engine class name lowercase
-        $engine = __NAMESPACE__ .'\\'. strtolower($engine);
+        $engine = __NAMESPACE__ .'\DBWrapper\\'. strtolower($engine);
 
         // Check if the class exists
         if(!class_exists($engine))
diff --git a/_sakura/components/database/mysql.php b/_sakura/components/database/mysql.php
index 8c9025f..021d6fb 100644
--- a/_sakura/components/database/mysql.php
+++ b/_sakura/components/database/mysql.php
@@ -3,11 +3,12 @@
  * Sakura MySQL Database Engine
  */
 
-namespace Sakura;
+namespace Sakura\DBWrapper;
 
 use PDO;
 use PDOException;
 use PDOStatement;
+use \Sakura\Configuration;
 
 class MySQL {
 
diff --git a/_sakura/sakura.php b/_sakura/sakura.php
index 6ecaa15..c867716 100644
--- a/_sakura/sakura.php
+++ b/_sakura/sakura.php
@@ -8,7 +8,7 @@
 namespace Sakura;
 
 // Define Sakura version
-define('SAKURA_VERSION',    '20150621');
+define('SAKURA_VERSION',    '20150625');
 define('SAKURA_VLABEL',     'Eminence');
 define('SAKURA_VTYPE',      'Development');
 define('SAKURA_COLOUR',     '#6C3082');
diff --git a/_sakura/templates/yuuno/main/forgotpassword.tpl b/_sakura/templates/yuuno/main/forgotpassword.tpl
index 59a81e9..725152b 100644
--- a/_sakura/templates/yuuno/main/forgotpassword.tpl
+++ b/_sakura/templates/yuuno/main/forgotpassword.tpl
@@ -7,9 +7,9 @@
             <input type="hidden" name="time" value="{{ php.time }}" />
             <input type="hidden" name="uid" value="{{ auth.userId }}" />
             <input type="hidden" name="mode" value="changepassword" />
-            <div class="profile-field">
+            <div class="profile-field{% if auth.forgotKey %} hidden{% endif %}">
                 <div><h2>Verification Key</h2></div>
-                <div style="text-align: center;"><input type="text" name="verk" placeholder="The key that was sent to you in the e-mail" class="inputStyling"{% if auth.forgotKey is not null %} value="{{ auth.forgotKey }}" disabled="disabled"{% endif %} /></div>
+                <div style="text-align: center;"><input type="text" name="verk" placeholder="The key that was sent to you in the e-mail" class="inputStyling"{% if auth.forgotKey %} value="{{ auth.forgotKey }}"{% endif %} /></div>
             </div>
             <div class="profile-field">
                 <div><h2>New Password</h2></div>
diff --git a/content/images/emoticons/extreme.png b/content/images/emoticons/extreme.png
new file mode 100644
index 0000000..2c02c6d
Binary files /dev/null and b/content/images/emoticons/extreme.png differ