diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index b00adfb9e..bc32476da 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -273,6 +273,8 @@
 					if (!$GLOBALS['__ThemeModuleSkin__'][$module_name]){
 						$GLOBALS['__ThemeModuleSkin__'][$module_name] = array();
 						$GLOBALS['__ThemeModuleSkin__'][$module_name]['skins'] = array();
+						$moduleInfo = $oModuleModel->getModuleInfoXml($module_name);
+						$GLOBALS['__ThemeModuleSkin__'][$module_name]['title'] = $moduleInfo->title;
 					}
 					$GLOBALS['__ThemeModuleSkin__'][$module_name]['skins'][$skin_info->name] = $oModuleModel->loadSkinInfo($skin_info->path, '', '');
 				}
diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php
index 616b13510..15e309021 100644
--- a/modules/layout/layout.admin.view.php
+++ b/modules/layout/layout.admin.view.php
@@ -21,12 +21,18 @@
 			// Set a layout list
 			$oLayoutModel = &getModel('layout');
 			$layout_list = $oLayoutModel->getDownloadedLayoutList('P', true);
+			
+			// get Theme layout
+			$oAdminModel = &getAdminModel('admin');
+			$themeList = $oAdminModel->getThemeList();
+			$themeLayoutList = array();
+			foreach($themeList as $themeInfo){
+				if(strpos($themeInfo->layout_info->name, '.') === false) continue;
+				$themeLayoutList[] = $oLayoutModel->getLayoutInfo($themeInfo->layout_info->name, null, 'P');
+			}
+			$layout_list = array_merge($layout_list, $themeLayoutList);
 			$layout_list[] = $oLayoutModel->getLayoutInfo('faceoff', null, 'P');
 			Context::set('type', 'P');
-			
-			//Security
-			$security = new Security();
-			$security->encodeHTML('layout_list..layout','layout_list..title');						
 
 			$pcLayoutCount = $oLayoutModel->getInstalledLayoutCount('P');
 			$mobileLayoutCount = $oLayoutModel->getInstalledLayoutCount('M');