diff --git a/.gitignore b/.gitignore
index dbac8bc..983cd64 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-/config/config.php
-/config/database.yml
 /log/*
 /public/assets
 /public/data
diff --git a/app/controllers/PostController.php b/app/controllers/PostController.php
index e558788..c6d5e5d 100755
--- a/app/controllers/PostController.php
+++ b/app/controllers/PostController.php
@@ -1038,7 +1038,7 @@ public function import()
             
             # Take folders as tags
             if (is_int(strpos($post['filename'], '/'))) {
-                $folders = str_replace('#', ':', $post['filename']);
+                $folders = str_replace('~', ':', $post['filename']);
                 $tags = array_filter(array_unique(array_merge(explode(' ', $post['tags']), explode('/', $folders))));
                 array_pop($tags);
                 $post['tags'] = trim($post['tags'].' '.implode(' ', $tags));
diff --git a/config/config.php b/config/config.php
new file mode 100644
index 0000000..b65f65c
--- /dev/null
+++ b/config/config.php
@@ -0,0 +1,26 @@
+<?php
+namespace MyImouto;
+
+/**
+ * Place your custom configuration here, instead
+ * of modifying the default_config.php file.
+ *
+ * Values placed here will overwrite the values in the parent class.
+ * List the properties you want to overwrite.
+ */
+class LocalConfig extends DefaultConfig
+{
+    public $app_name      = 'Delishbooru';
+
+    public $server_host   = 'delishbooru.com';
+
+    public $url_base      = 'http://delishbooru.com';
+
+    public $admin_contact = 'admin@myimouto';
+    
+    public $download_filename_prefix = "delish";
+    
+    public $starting_level = 20;
+    
+    public $member_post_limit = 20;
+}
diff --git a/config/database.yml b/config/database.yml
new file mode 100644
index 0000000..d1af591
--- /dev/null
+++ b/config/database.yml
@@ -0,0 +1,15 @@
+# Copy this to "database.yml" and adjust the fields accordingly.
+# Only works with mysql adapter.
+login: &login
+  adapter: mysql
+  host: 127.0.0.1
+  username: danbo
+  password: xxx
+
+development:
+  <<: *login
+  database: myimouto_dev
+
+production:
+  <<: *login
+  database: danbo
diff --git a/public/favicon.ico b/public/favicon.ico
index 57746a3..63e0fc7 100755
Binary files a/public/favicon.ico and b/public/favicon.ico differ