diff --git a/resources/classes/text.php b/resources/classes/text.php
index dcff4a97be..e78095afd3 100644
--- a/resources/classes/text.php
+++ b/resources/classes/text.php
@@ -30,6 +30,8 @@ class text {
 	 * @var string $app_path		examples: app/exec or core/domains
 	 */
 	public function get($language_code = null, $app_path = null) {
+		//get the global app_languages.php
+			include $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/core/app_languages.php";
 		//get the app_languages.php
 			if ($app_path != null) {
 				include $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/".$app_path."/app_languages.php";
@@ -49,15 +51,16 @@ class text {
 			}
 			$_SESSION['app']['languages'] = array_unique($app_languages);
 
+		//check the session language
+			if(isset($_SESSION['domain'])){
+				$language_code = $_SESSION['domain']['language']['code'];
+			}elseif($language_code == null){
+				$language_code = 'en-us';
+			}
 		//reduce to specific language
 			if ($language_code != 'all') {
 				foreach($text as $key => $value) {
-					if ($language_code == null) {
-						$text[$key] = $value[$_SESSION['domain']['language']['code']];
-					}
-					else {
-						$text[$key] = $value[$language_code];
-					}
+					$text[$key] = $value[$language_code];
 				}
 			}
 
diff --git a/resources/install.php b/resources/install.php
index 5680e4162d..614b78f280 100644
--- a/resources/install.php
+++ b/resources/install.php
@@ -1745,7 +1745,7 @@ EOL;
 			$theme_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/themes';
 			if ($handle = opendir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/themes')) {
 				while (false !== ($dir_name = readdir($handle))) {
-					if ($dir_name != "." && $dir_name != ".." && $dir_name != ".svn" && $dir_name != ".git" && is_readable($theme_dir.'/'.$dir_name)) {
+					if ($dir_name != "." && $dir_name != ".." && $dir_name != ".svn" && $dir_name != ".git" && $dir_name != "flags" && is_readable($theme_dir.'/'.$dir_name)) {
 						$dir_label = str_replace('_', ' ', $dir_name);
 						$dir_label = str_replace('-', ' ', $dir_label);
 						if ($dir_name == $install_template_name) {
diff --git a/themes/flags/ar-eg.png b/themes/flags/ar-eg.png
new file mode 100644
index 0000000000..e5ef8f1fcd
Binary files /dev/null and b/themes/flags/ar-eg.png differ
diff --git a/themes/flags/de-at.png b/themes/flags/de-at.png
new file mode 100644
index 0000000000..0f15f34f28
Binary files /dev/null and b/themes/flags/de-at.png differ
diff --git a/themes/flags/en-us.png b/themes/flags/en-us.png
new file mode 100644
index 0000000000..10f451fe85
Binary files /dev/null and b/themes/flags/en-us.png differ
diff --git a/themes/flags/es-cl.png b/themes/flags/es-cl.png
new file mode 100644
index 0000000000..29c6d61bd4
Binary files /dev/null and b/themes/flags/es-cl.png differ
diff --git a/themes/flags/fr-fr.png b/themes/flags/fr-fr.png
new file mode 100644
index 0000000000..8332c4ec23
Binary files /dev/null and b/themes/flags/fr-fr.png differ
diff --git a/themes/flags/nl-nl.png b/themes/flags/nl-nl.png
new file mode 100644
index 0000000000..fe44791e32
Binary files /dev/null and b/themes/flags/nl-nl.png differ
diff --git a/themes/flags/pl.png b/themes/flags/pl.png
new file mode 100644
index 0000000000..d413d010b5
Binary files /dev/null and b/themes/flags/pl.png differ
diff --git a/themes/flags/pt-br.png b/themes/flags/pt-br.png
new file mode 100644
index 0000000000..9b1a5538b2
Binary files /dev/null and b/themes/flags/pt-br.png differ
diff --git a/themes/flags/pt-pt.png b/themes/flags/pt-pt.png
new file mode 100644
index 0000000000..ece7980150
Binary files /dev/null and b/themes/flags/pt-pt.png differ
diff --git a/themes/flags/sv-se.png b/themes/flags/sv-se.png
new file mode 100644
index 0000000000..1994653dac
Binary files /dev/null and b/themes/flags/sv-se.png differ
diff --git a/themes/flags/uk.png b/themes/flags/uk.png
new file mode 100644
index 0000000000..09563a2194
Binary files /dev/null and b/themes/flags/uk.png differ