diff --git a/application/config/gettext.php b/application/config/gettext.php
index bb1bbb23b..ca7396308 100644
--- a/application/config/gettext.php
+++ b/application/config/gettext.php
@@ -4,7 +4,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  * Gettext library config
  * @package 	CodeIgniter\CI-Gettext
  * @category 	Configuration
- * @author 	Kader Bouyakoub <bkader@mail.com> 
+ * @author 	Kader Bouyakoub <bkader@mail.com>
  * 			MODIFIED BY Fabian Berg <mail@hb9hil.org>
  * @link 	http://www.bkader.com/
  */
@@ -53,14 +53,158 @@ $config['gettext_domain'] = NULL;
 | A list of enabled languages. These are the language that will be
 | used on the site.
 */
-$config['gettext_languages'] = array(
-	'arabic',
-	'english',
-	'french',
-	'german',
-	'italian',
-	'portuguese',
-	'spanish',
+$config['languages'] = array(
+
+	'bulgarian' => array(
+		'name'      => 'Български',
+		'name_en'   => 'Bulgarian',
+		'folder'    => 'bulgarian',
+		'locale'    => 'bg-BG',
+		'gettext'   => 'bg_BG',
+		'direction' => 'ltr',
+		'code'      => 'bg',
+		'flag'      => 'bg',
+	),
+	'chinese_simplified' => array(
+		'name'      => '中文（简体）',
+		'name_en'   => 'Chinese (Simplified)',
+		'folder'    => 'chinese_simplified',
+		'locale'    => 'zh-CN',
+		'gettext'   => 'zh_CN',
+		'direction' => 'ltr',
+		'code'      => 'zh-Hans',
+		'flag'      => 'cn',
+	),
+	'czech' => array(
+		'name'      => 'Čeština',
+		'name_en'   => 'Czech',
+		'folder'    => 'czech',
+		'locale'    => 'cs-CZ',
+		'gettext'   => 'cs_CZ',
+		'direction' => 'ltr',
+		'code'      => 'cs',
+		'flag'      => 'cz',
+	),
+	'dutch' => array(
+		'name'      => 'Nederlands',
+		'name_en'   => 'Dutch',
+		'folder'    => 'dutch',
+		'locale'    => 'nl-NL',
+		'gettext'   => 'nl_NL',
+		'direction' => 'ltr',
+		'code'      => 'nl',
+		'flag'      => 'nl',
+	),
+	'english' => array(
+		'name'      => 'English',
+		'name_en'   => 'English',
+		'folder'    => 'english',
+		'locale'    => 'en-US',
+		'gettext'   => 'en_US',
+		'direction' => 'ltr',
+		'code'      => 'en',
+		'flag'      => 'us',
+	),
+	'finnish' => array(
+		'name'      => 'Suomi',
+		'name_en'   => 'Finnish',
+		'folder'    => 'finnish',
+		'locale'    => 'fi-FI',
+		'gettext'   => 'fi_FI',
+		'direction' => 'ltr',
+		'code'      => 'fi',
+		'flag'      => 'fi',
+	),
+	'french' => array(
+		'name'      => 'Français',
+		'name_en'   => 'French',
+		'folder'    => 'french',
+		'locale'    => 'fr-FR',
+		'gettext'   => 'fr_FR',
+		'direction' => 'ltr',
+		'code'      => 'fr',
+		'flag'      => 'fr',
+	),
+	'german' => array(
+		'name'      => 'Deutsch',
+		'name_en'   => 'German',
+		'folder'    => 'german',
+		'locale'    => 'de-DE',
+		'gettext'   => 'de_DE',
+		'direction' => 'ltr',
+		'code'      => 'de',
+		'flag'      => 'de',
+	),
+	'greek' => array(
+		'name'      => 'Ελληνικά',
+		'name_en'   => 'Greek',
+		'folder'    => 'greek',
+		'locale'    => 'el-GR',
+		'gettext'   => 'el_GR',
+		'direction' => 'ltr',
+		'code'      => 'el',
+		'flag'      => 'gr',
+	),
+	'italian' => array(
+		'name'      => 'Italiano',
+		'name_en'   => 'Italian',
+		'folder'    => 'italian',
+		'locale'    => 'it-IT',
+		'gettext'   => 'it_IT',
+		'direction' => 'ltr',
+		'code'      => 'it',
+		'flag'      => 'it',
+	),
+	'polish' => array(
+		'name'      => 'Polski',
+		'name_en'   => 'Polish',
+		'folder'    => 'polish',
+		'locale'    => 'pl-PL',
+		'gettext'   => 'pl_PL',
+		'direction' => 'ltr',
+		'code'      => 'pl',
+		'flag'      => 'pl',
+	),
+	'russian' => array(
+		'name'      => 'Русский',
+		'name_en'   => 'Russian',
+		'folder'    => 'russian',
+		'locale'    => 'ru-RU',
+		'gettext'   => 'ru_RU',
+		'direction' => 'ltr',
+		'code'      => 'ru',
+		'flag'      => 'ru',
+	),
+	'spanish' => array(
+		'name'      => 'Español',
+		'name_en'   => 'Spanish',
+		'folder'    => 'spanish',
+		'locale'    => 'es-ES',
+		'gettext'   => 'es_ES',
+		'direction' => 'ltr',
+		'code'      => 'es',
+		'flag'      => 'es',
+	),
+	'swedish' => array(
+		'name'      => 'Svenska',
+		'name_en'   => 'Swedish',
+		'folder'    => 'swedish',
+		'locale'    => 'sv-SE',
+		'gettext'   => 'sv_SE',
+		'direction' => 'ltr',
+		'code'      => 'sv',
+		'flag'      => 'se',
+	),
+	'turkish' => array(
+		'name'      => 'Türkçe',
+		'name_en'   => 'Turkish',
+		'folder'    => 'turkish',
+		'locale'    => 'tr-TR',
+		'gettext'   => 'tr_TR',
+		'direction' => 'ltr',
+		'code'      => 'tr',
+		'flag'      => 'tr',
+	)
 );
 
 /*
diff --git a/application/hooks/gettext/Gettext.php b/application/hooks/gettext/Gettext.php
index cc372e8f9..264f9b2d6 100644
--- a/application/hooks/gettext/Gettext.php
+++ b/application/hooks/gettext/Gettext.php
@@ -190,8 +190,8 @@ class Gettext
 			return $this->languages;
 		}
 
-		include __DIR__.'/vendor/languages.php';
-		$this->languages = $languages;
+		$this->languages = $this->config['languages'];
+
 		return $this->languages;
 	}
 
@@ -210,11 +210,10 @@ class Gettext
 		}
 
 		// Cache them before returning.
-		$this->site_languages = array_intersect_key(
-			$this->_get_languages(), 
-			array_flip($this->config['languages'])
-		);
+		$this->site_languages = $this->config['languages'];
+
 		return $this->site_languages;
+
 	}
 
 	/**
diff --git a/application/hooks/gettext/vendor/languages.php b/application/hooks/gettext/vendor/languages.php
deleted file mode 100644
index 211c9117c..000000000
--- a/application/hooks/gettext/vendor/languages.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-$languages = array(
-
-	// Arabic
-	'arabic' => array(
-		'name'      => 'العربية',
-		'name_en'   => 'Arabic',
-		'folder'    => 'arabic',
-		'locale'    => 'ar-DZ',
-		'gettext'   => 'ar_DZ',
-		'direction' => 'rtl',
-		'code'      => 'ar',
-		'flag'      => 'dz',
-	),
-
-	// English
-	'english' => array(
-		'name'      => 'English',
-		'name_en'   => 'English',
-		'folder'    => 'english',
-		'locale'    => 'en-US',
-		'gettext'   => 'en_US',
-		'direction' => 'ltr',
-		'code'      => 'en',
-		'flag'      => 'us',
-	),
-
-	// French
-	'french' => array(
-		'name'      => 'Français',
-		'name_en'   => 'French',
-		'folder'    => 'french',
-		'locale'    => 'fr-FR',
-		'gettext'   => 'fr_FR',
-		'direction' => 'ltr',
-		'code'      => 'fr',
-		'flag'      => 'fr',
-	),
-
-	// German
-	'german' => array(
-		'name'      => 'Deutsch',
-		'name_en'   => 'German',
-		'folder'    => 'german',
-		'locale'    => 'de-DE',
-		'gettext'   => 'de_DE',
-		'direction' => 'ltr',
-		'code'      => 'de',
-		'flag'      => 'de',
-	),
-
-	// Italian
-	'italian' => array(
-		'name'      => 'Italiano',
-		'name_en'   => 'Italian',
-		'folder'    => 'italian',
-		'locale'    => 'it-IT',
-		'gettext'   => 'it_IT',
-		'direction' => 'ltr',
-		'code'      => 'it',
-		'flag'      => 'it',
-	),
-
-	// Portuguese
-	'portuguese' => array(
-		'name'      => 'Português',
-		'name_en'   => 'Portuguese',
-		'folder'    => 'portuguese',
-		'locale'    => 'pt-PT',
-		'gettext'   => 'pt_PT',
-		'direction' => 'ltr',
-		'code'      => 'pt',
-		'flag'      => 'pt',
-	),
-
-	// Spanish
-	'spanish' => array(
-		'name'      => 'Español',
-		'name_en'   => 'Spanish',
-		'folder'    => 'spanish',
-		'locale'    => 'es-ES',
-		'gettext'   => 'es_ES',
-		'direction' => 'ltr',
-		'code'      => 'es',
-		'flag'      => 'es',
-	),
-
-);
-
-/* End of file languages.php */
-/* Location: ./application/hooks/gettext/vendor/languages.php */
\ No newline at end of file