diff --git a/htdocs/application/config/config.php b/htdocs/application/config/config.php
index 7375342..9b07722 100644
--- a/htdocs/application/config/config.php
+++ b/htdocs/application/config/config.php
@@ -69,7 +69,7 @@ $config['url_suffix'] = '';
 | than english.
 |
 */
-$config['language']	= 'swissgerman';
+#$config['language']	= 'english';    #this is configured in config/stikked.php
 
 /*
 |--------------------------------------------------------------------------
diff --git a/htdocs/application/config/stikked.php b/htdocs/application/config/stikked.php
index 082337a..f747fd0 100644
--- a/htdocs/application/config/stikked.php
+++ b/htdocs/application/config/stikked.php
@@ -25,10 +25,21 @@ $config['db_password'] = 'stikked';
  *
  * Which theme to use
  * Folder name in htdocs/themes/
+ * Currently: default, bootstrap, gabdark, gabdark3
  *
 */
 $config['theme'] = 'default';
 
+/**
+ * Language
+ *
+ * Which language to use
+ * Translate Stikked to your own language, see htdocs/application/language files
+ * Currently: english, swissgerman
+ *
+*/
+$config['language'] = 'english';
+
 /**
  * Combine JS & CSS files (recommended)
  *
diff --git a/htdocs/application/language/english/stikked_lang.php b/htdocs/application/language/english/stikked_lang.php
index c234ab8..0b63472 100644
--- a/htdocs/application/language/english/stikked_lang.php
+++ b/htdocs/application/language/english/stikked_lang.php
@@ -39,6 +39,7 @@ $lang['paste_fullwidth'] = 'to full width of browser';
 $lang['paste_replies'] = 'Replies to';
 $lang['paste_replyto'] = 'Reply to';
 $lang['paste_replyto_desc'] = 'Here you can reply to the paste above';
+$lang['paste_missing'] = 'There have been no Pastes';
 $lang['exp_forever'] = 'Keep Forever';
 $lang['exp_30min'] = '30 Minutes';
 $lang['exp_1h'] = '1 Hour';