diff --git a/mhn/css/common.css.php b/mhn/css/common.css.php
index 6ee36f1c7..8e0a6b1ae 100644
--- a/mhn/css/common.css.php
+++ b/mhn/css/common.css.php
@@ -1,5 +1,9 @@
 <?php
-if (!defined('PMA_MINIMUM_COMMON') && !defined('TESTSUITE')) { exit(); }
+
+// unplanned execution path
+if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
+    exit();
+}
 ?>
 /*! normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */
 progress,sub,sup{vertical-align:baseline}button,hr,input{overflow:visible}[type=checkbox],[type=radio],legend{box-sizing:border-box;padding:0}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:bolder}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}svg:not(:root){overflow:hidden}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}button,input,select,textarea{font:inherit;margin:0}optgroup{font-weight:700}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:ButtonText dotted 1px}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{color:inherit;display:table;max-width:100%;white-space:normal}textarea{overflow:auto}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-input-placeholder{color:inherit;opacity:.54}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}
@@ -25,7 +29,7 @@ progress[value]::-webkit-progress-value{background-color:<?php echo $GLOBALS['cf
 progress[value]::-moz-progress-bar{background-color:<?php echo $GLOBALS['cfg']['cPri']; ?>}
 fieldset{border:none}
 <?php require_once('mhn.icons.css.php'); ?>
-html{font-size:<?php echo $_SESSION['PMA_Theme']->getFontSize(); ?>}
+html{font-size:<?php echo $theme->getFontSize(); ?>}
 input,select,textarea{font-size:1em}
 body{
 <?php if (!empty($GLOBALS['cfg']['FontFamily'])) :?>
@@ -640,6 +644,8 @@ tr.disabled td,td.disabled{background-color:#f3f3f3;color:#aaa}
 #floating_menubar{left:-3px!important}
 #topmenu a{text-shadow:0 1px 0 #fff;text-transform:uppercase}
 #topmenu .error{background:#eee;border:0 !important;color:#aaa}
+#topmenu .tabactive {background: #fff!important}
+.scrollindicator {display: none}
 ul#topmenu,
 ul#topmenu2,
 ul.tabs{font-weight:bold;list-style-type:none;margin:0;padding:0}
@@ -1139,7 +1145,7 @@ select.invalid_value,
 	display:inline;
 	left:0;
 	right:0;
-	background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif'); ?>);
+	background-image:url(<?php echo $theme->getImgPath('ajax_clock_small.gif'); ?>);
 	background-repeat:no-repeat;
 	background-position:2%;
 	border:1px solid #e2b709;
@@ -1450,7 +1456,7 @@ fieldset .disabled-field td{color:#666;background-color:#ddd}
 	border-radius:.3em;
 }
 .cPointer{
-	background:url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_pointer.png'); ?>);
+	background:url(<?php echo $theme->getImgPath('col_pointer.png'); ?>);
 	height:20px;
 	margin-<?php echo $left; ?>:-5px;  /* must be minus half of its width */
 	margin-top:-10px;
@@ -1546,16 +1552,16 @@ fieldset .disabled-field td{color:#666;background-color:#ddd}
 .cEdit .cell_edit_hint{color:#555;font-size:.8em;margin:.3em .2em}
 .cEdit .edit_box{overflow-x:hidden;overflow-y:scroll;;padding:0;margin:0}
 .cEdit .edit_box_posting{
-	background:#FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif'); ?>) no-repeat right center;
+	background:#FFF url(<?php echo $theme->getImgPath('ajax_clock_small.gif'); ?>) no-repeat right center;
 	padding-<?php echo $right; ?>:1.5em;
 }
 .cEdit .edit_area_loading{
-	background:#FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif'); ?>) no-repeat center;
+	background:#FFF url(<?php echo $theme->getImgPath('ajax_clock_small.gif'); ?>) no-repeat center;
 	height:10em;
 }
 .cEdit .goto_link{background:#eee;color:#555;padding:.2em .3em}
 .saving_edited_data{
-	background:url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif'); ?>) no-repeat left;
+	background:url(<?php echo $theme->getImgPath('ajax_clock_small.gif'); ?>) no-repeat left;
 	padding-<?php echo $left; ?>:20px;
 }
 .relationalTable select{
@@ -1824,7 +1830,7 @@ html.ie7 #pma_console .query_input{
 #composite_index_list{list-style-type:none;list-style-position:inside}
 span.drag_icon{
 	display:inline-block;
-	background-image:url('<?php echo $_SESSION['PMA_Theme']->getImgPath('s_sortable.png'); ?>');
+	background-image:url('<?php echo $theme->getImgPath('s_sortable.png'); ?>');
 	background-position:center center;
 	background-repeat:no-repeat;
 	width:1em;
@@ -1840,8 +1846,8 @@ meter[value="3"]::-webkit-meter-optimum-value {background: linear-gradient(white
 th.header{cursor:pointer;color:#235a81}
 th.header:hover{text-decoration:underline}
 th.header .sorticon{width:16px;height:16px;background-repeat:no-repeat;background-position:right center;display:inline-table;vertical-align:middle;float:right}
-th.headerSortUp .sorticon, th.headerSortDown:hover .sorticon{background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_desc.png'); ?>)}
-th.headerSortDown .sorticon, th.headerSortUp:hover .sorticon{background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asc.png'); ?>)}
+th.headerSortUp .sorticon, th.headerSortDown:hover .sorticon{background-image:url(<?php echo $theme->getImgPath('s_desc.png'); ?>)}
+th.headerSortDown .sorticon, th.headerSortUp:hover .sorticon{background-image:url(<?php echo $theme->getImgPath('s_asc.png'); ?>)}
 
 body .ui-dialog .ui-dialog-titlebar-close{<?php echo $right; ?>:.3em;<?php echo $left; ?>:initial}
 body .ui-dialog .ui-dialog-title{float:<?php echo $left; ?>}
diff --git a/mhn/css/pmd.css.php b/mhn/css/designer.css.php
similarity index 87%
rename from mhn/css/pmd.css.php
rename to mhn/css/designer.css.php
index 15197a1f8..eac66dffd 100644
--- a/mhn/css/pmd.css.php
+++ b/mhn/css/designer.css.php
@@ -10,13 +10,13 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')){ exit(); }
 	display:block;
 }
 #canvas{background-color:#fff;color:#000}
-canvas.pmd{
+canvas.designer{
 	display:inline-block;
 	overflow:hidden;
 	text-align:left;
 }
-canvas.pmd *{behavior:url(#default#VML)}
-.pmd_tab{
+canvas.designer *{behavior:url(#default#VML)}
+.designer_tab{
 	background-color:#fff;
 	color:#000;
 	border-collapse:collapse;
@@ -51,7 +51,7 @@ canvas.pmd *{behavior:url(#default#VML)}
 	cursor:default;
 	background-color:#FFE6E6;
 }
-#pmd_hint{
+#designer_hint{
 	white-space:nowrap;
 	position:absolute;
 	background-color:#99FF99;
@@ -65,7 +65,7 @@ canvas.pmd *{behavior:url(#default#VML)}
 	width:100%;
 	height:500px;
 }
-.pmd_Tabs{
+.designer_Tabs{
 	cursor:default;
 	color:#0055bb;
 	white-space:nowrap;
@@ -77,7 +77,7 @@ canvas.pmd *{behavior:url(#default#VML)}
 	background-color:#fff;
 	border:#ccc solid 1px;
 }
-.pmd_Tabs:hover{
+.designer_Tabs:hover{
 	cursor:default;
 	color:#0055bb;
 	text-indent:3px;
@@ -171,7 +171,7 @@ canvas.pmd *{behavior:url(#default#VML)}
 	background-color:#fff;
 	color:#000;
 }
-.pmd_header{
+.designer_header{
 	background-color:#EAEEF0;
 	color:#000;
 	text-align:center;
@@ -182,20 +182,20 @@ canvas.pmd *{behavior:url(#default#VML)}
 	width:100%;
 	position:fixed;
 }
-.pmd_header a, .pmd_header span{
+.designer_header a, .designer_header span{
 	float:left;
 	display:block;
 	padding:1.5px;
 }
-.pmd_header .M_bord{
+.designer_header .M_bord{
 	display:block;
 	float:<?php echo $left; ?>;
 	margin:4px;
 	height:20px;
 	width:2px;
 }
-.pmd_header a.first{margin-right:1em}
-.pmd_header a.last{margin-left:1em}
+.designer_header a.first{margin-right:1em}
+.designer_header a.last{margin-left:1em}
 a.M_butt{display:inline-block}
 a.M_butt img,a.M_butt_Selected_down img{
 	-webkit-filter:grayscale(1);
@@ -233,7 +233,7 @@ a.M_butt:hover{
 	z-index:100;
 	width:153px;
 }
-#pmd_optionse{
+#designer_optionse{
 	position:absolute;
 	<?php echo $left; ?>:636px;
 	top:85px;
@@ -241,7 +241,7 @@ a.M_butt:hover{
 	width:153px;
 }
 #layer_menu_sizer{
-	background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/resize.png'); ?>);
+	background-image:url(<?php echo $theme->getImgPath('designer/resize.png'); ?>);
 	cursor:ew-resize;
 }
 #layer_menu_sizer .icon{margin:0}
@@ -263,21 +263,21 @@ a.trigger{
 	<?php echo $right; ?>:0;
 	color:#fff;
 	padding:10px 40px 10px 15px;
-	background:#333 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/plus.png'); ?>) 85% 55% no-repeat;
+	background:#333 url(<?php echo $theme->getImgPath('designer/plus.png'); ?>) 85% 55% no-repeat;
 	border:1px solid #444;
 	display:block;
 	z-index:102;
 }
 a.trigger:hover{
 	color:#080808;
-	background:#fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/plus.png'); ?>) 85% 55% no-repeat;
+	background:#fff696 url(<?php echo $theme->getImgPath('designer/plus.png'); ?>) 85% 55% no-repeat;
 	border:1px solid #999;
 }
 a.active.trigger{
-	background:#222 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/minus.png'); ?>) 85% 55% no-repeat;
+	background:#222 url(<?php echo $theme->getImgPath('designer/minus.png'); ?>) 85% 55% no-repeat;
 	z-index:999;
 }
-a.active.trigger:hover{background:#fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/minus.png'); ?>) 85% 55% no-repeat}
+a.active.trigger:hover{background:#fff696 url(<?php echo $theme->getImgPath('designer/minus.png'); ?>) 85% 55% no-repeat}
 .toggle_container .block{
 	background-color:#DBE4E8;
 	border-top:1px solid #999;
@@ -331,4 +331,4 @@ a.active.trigger:hover{background:#fff696 url(<?php echo $_SESSION['PMA_Theme']-
 	width:100%;
 	position:absolute;
 	left:0;
-}
\ No newline at end of file
+}
diff --git a/mhn/css/mhn.icons.css.php b/mhn/css/mhn.icons.css.php
index ea0a85ab6..45d2e69d0 100644
--- a/mhn/css/mhn.icons.css.php
+++ b/mhn/css/mhn.icons.css.php
@@ -1,6 +1,6 @@
 <?php
 $css = '';
-$url = $_SESSION['PMA_Theme']->getPath().'/css/mhn.img.php?i=';
+$url = $GLOBALS['PMA_Theme']->getPath().'/css/mhn.img.php?i=';
 $GLOBALS['cfg']['imgPath'] = $url;
 $imp = '!important';
 function h($a){ return str_replace('#','',$a); }
@@ -107,4 +107,4 @@ $css.='.icon.ic_window-new{background:url('.$url.'window-new)!important}';
 $css.='.icon.ic_b_tblops{background:url('.$url.'tbl-ops)!important}';
 $css.='.icon.ic_s_lang{background:url('.$url.'lang)!important}';
 $css.='.icon.ic_s_theme{background:url('.$url.'theme)!important}';
-echo $css;
\ No newline at end of file
+echo $css;
diff --git a/mhn/img/pmd/2leftarrow.png b/mhn/img/designer/2leftarrow.png
similarity index 100%
rename from mhn/img/pmd/2leftarrow.png
rename to mhn/img/designer/2leftarrow.png
diff --git a/mhn/img/pmd/2leftarrow_m.png b/mhn/img/designer/2leftarrow_m.png
similarity index 100%
rename from mhn/img/pmd/2leftarrow_m.png
rename to mhn/img/designer/2leftarrow_m.png
diff --git a/mhn/img/pmd/2rightarrow.png b/mhn/img/designer/2rightarrow.png
similarity index 100%
rename from mhn/img/pmd/2rightarrow.png
rename to mhn/img/designer/2rightarrow.png
diff --git a/mhn/img/pmd/2rightarrow_m.png b/mhn/img/designer/2rightarrow_m.png
similarity index 100%
rename from mhn/img/pmd/2rightarrow_m.png
rename to mhn/img/designer/2rightarrow_m.png
diff --git a/mhn/img/pmd/FieldKey_small.png b/mhn/img/designer/FieldKey_small.png
similarity index 100%
rename from mhn/img/pmd/FieldKey_small.png
rename to mhn/img/designer/FieldKey_small.png
diff --git a/mhn/img/pmd/Field_small.png b/mhn/img/designer/Field_small.png
similarity index 100%
rename from mhn/img/pmd/Field_small.png
rename to mhn/img/designer/Field_small.png
diff --git a/mhn/img/pmd/Field_small_char.png b/mhn/img/designer/Field_small_char.png
similarity index 100%
rename from mhn/img/pmd/Field_small_char.png
rename to mhn/img/designer/Field_small_char.png
diff --git a/mhn/img/pmd/Field_small_date.png b/mhn/img/designer/Field_small_date.png
similarity index 100%
rename from mhn/img/pmd/Field_small_date.png
rename to mhn/img/designer/Field_small_date.png
diff --git a/mhn/img/pmd/Field_small_int.png b/mhn/img/designer/Field_small_int.png
similarity index 100%
rename from mhn/img/pmd/Field_small_int.png
rename to mhn/img/designer/Field_small_int.png
diff --git a/mhn/img/pmd/Header.png b/mhn/img/designer/Header.png
similarity index 100%
rename from mhn/img/pmd/Header.png
rename to mhn/img/designer/Header.png
diff --git a/mhn/img/pmd/Header_Linked.png b/mhn/img/designer/Header_Linked.png
similarity index 100%
rename from mhn/img/pmd/Header_Linked.png
rename to mhn/img/designer/Header_Linked.png
diff --git a/mhn/img/pmd/anchor.png b/mhn/img/designer/anchor.png
similarity index 100%
rename from mhn/img/pmd/anchor.png
rename to mhn/img/designer/anchor.png
diff --git a/mhn/img/pmd/and_icon.png b/mhn/img/designer/and_icon.png
similarity index 100%
rename from mhn/img/pmd/and_icon.png
rename to mhn/img/designer/and_icon.png
diff --git a/mhn/img/pmd/ang_direct.png b/mhn/img/designer/ang_direct.png
similarity index 100%
rename from mhn/img/pmd/ang_direct.png
rename to mhn/img/designer/ang_direct.png
diff --git a/mhn/img/pmd/bord.png b/mhn/img/designer/bord.png
similarity index 100%
rename from mhn/img/pmd/bord.png
rename to mhn/img/designer/bord.png
diff --git a/mhn/img/pmd/bottom.png b/mhn/img/designer/bottom.png
similarity index 100%
rename from mhn/img/pmd/bottom.png
rename to mhn/img/designer/bottom.png
diff --git a/mhn/img/pmd/def.png b/mhn/img/designer/def.png
similarity index 100%
rename from mhn/img/pmd/def.png
rename to mhn/img/designer/def.png
diff --git a/mhn/img/pmd/display_field.png b/mhn/img/designer/display_field.png
similarity index 100%
rename from mhn/img/pmd/display_field.png
rename to mhn/img/designer/display_field.png
diff --git a/mhn/img/pmd/downarrow1.png b/mhn/img/designer/downarrow1.png
similarity index 100%
rename from mhn/img/pmd/downarrow1.png
rename to mhn/img/designer/downarrow1.png
diff --git a/mhn/img/pmd/downarrow2.png b/mhn/img/designer/downarrow2.png
similarity index 100%
rename from mhn/img/pmd/downarrow2.png
rename to mhn/img/designer/downarrow2.png
diff --git a/mhn/img/pmd/downarrow2_m.png b/mhn/img/designer/downarrow2_m.png
similarity index 100%
rename from mhn/img/pmd/downarrow2_m.png
rename to mhn/img/designer/downarrow2_m.png
diff --git a/mhn/img/pmd/exec.png b/mhn/img/designer/exec.png
similarity index 100%
rename from mhn/img/pmd/exec.png
rename to mhn/img/designer/exec.png
diff --git a/mhn/img/pmd/exec_small.png b/mhn/img/designer/exec_small.png
similarity index 100%
rename from mhn/img/pmd/exec_small.png
rename to mhn/img/designer/exec_small.png
diff --git a/mhn/img/pmd/exitFullscreen.png b/mhn/img/designer/exitFullscreen.png
similarity index 100%
rename from mhn/img/pmd/exitFullscreen.png
rename to mhn/img/designer/exitFullscreen.png
diff --git a/mhn/img/pmd/export.png b/mhn/img/designer/export.png
similarity index 100%
rename from mhn/img/pmd/export.png
rename to mhn/img/designer/export.png
diff --git a/mhn/img/pmd/favicon.ico b/mhn/img/designer/favicon.ico
similarity index 100%
rename from mhn/img/pmd/favicon.ico
rename to mhn/img/designer/favicon.ico
diff --git a/mhn/img/pmd/grid.png b/mhn/img/designer/grid.png
similarity index 100%
rename from mhn/img/pmd/grid.png
rename to mhn/img/designer/grid.png
diff --git a/mhn/img/pmd/help.png b/mhn/img/designer/help.png
similarity index 100%
rename from mhn/img/pmd/help.png
rename to mhn/img/designer/help.png
diff --git a/mhn/img/pmd/help_relation.png b/mhn/img/designer/help_relation.png
similarity index 100%
rename from mhn/img/pmd/help_relation.png
rename to mhn/img/designer/help_relation.png
diff --git a/mhn/img/pmd/left_panel_tab.png b/mhn/img/designer/left_panel_tab.png
similarity index 100%
rename from mhn/img/pmd/left_panel_tab.png
rename to mhn/img/designer/left_panel_tab.png
diff --git a/mhn/img/pmd/minus.png b/mhn/img/designer/minus.png
similarity index 100%
rename from mhn/img/pmd/minus.png
rename to mhn/img/designer/minus.png
diff --git a/mhn/img/pmd/or_icon.png b/mhn/img/designer/or_icon.png
similarity index 100%
rename from mhn/img/pmd/or_icon.png
rename to mhn/img/designer/or_icon.png
diff --git a/mhn/img/pmd/page_add.png b/mhn/img/designer/page_add.png
similarity index 100%
rename from mhn/img/pmd/page_add.png
rename to mhn/img/designer/page_add.png
diff --git a/mhn/img/pmd/page_delete.png b/mhn/img/designer/page_delete.png
similarity index 100%
rename from mhn/img/pmd/page_delete.png
rename to mhn/img/designer/page_delete.png
diff --git a/mhn/img/pmd/page_edit.png b/mhn/img/designer/page_edit.png
similarity index 100%
rename from mhn/img/pmd/page_edit.png
rename to mhn/img/designer/page_edit.png
diff --git a/mhn/img/pmd/pdf.png b/mhn/img/designer/pdf.png
similarity index 100%
rename from mhn/img/pmd/pdf.png
rename to mhn/img/designer/pdf.png
diff --git a/mhn/img/pmd/plus.png b/mhn/img/designer/plus.png
similarity index 100%
rename from mhn/img/pmd/plus.png
rename to mhn/img/designer/plus.png
diff --git a/mhn/img/pmd/query_builder.png b/mhn/img/designer/query_builder.png
similarity index 100%
rename from mhn/img/pmd/query_builder.png
rename to mhn/img/designer/query_builder.png
diff --git a/mhn/img/pmd/relation.png b/mhn/img/designer/relation.png
similarity index 100%
rename from mhn/img/pmd/relation.png
rename to mhn/img/designer/relation.png
diff --git a/mhn/img/pmd/reload.png b/mhn/img/designer/reload.png
similarity index 100%
rename from mhn/img/pmd/reload.png
rename to mhn/img/designer/reload.png
diff --git a/mhn/img/pmd/resize.png b/mhn/img/designer/resize.png
similarity index 100%
rename from mhn/img/pmd/resize.png
rename to mhn/img/designer/resize.png
diff --git a/mhn/img/pmd/resizeright.png b/mhn/img/designer/resizeright.png
similarity index 100%
rename from mhn/img/pmd/resizeright.png
rename to mhn/img/designer/resizeright.png
diff --git a/mhn/img/pmd/rightarrow1.png b/mhn/img/designer/rightarrow1.png
similarity index 100%
rename from mhn/img/pmd/rightarrow1.png
rename to mhn/img/designer/rightarrow1.png
diff --git a/mhn/img/pmd/rightarrow2.png b/mhn/img/designer/rightarrow2.png
similarity index 100%
rename from mhn/img/pmd/rightarrow2.png
rename to mhn/img/designer/rightarrow2.png
diff --git a/mhn/img/pmd/save.png b/mhn/img/designer/save.png
similarity index 100%
rename from mhn/img/pmd/save.png
rename to mhn/img/designer/save.png
diff --git a/mhn/img/pmd/save_as.png b/mhn/img/designer/save_as.png
similarity index 100%
rename from mhn/img/pmd/save_as.png
rename to mhn/img/designer/save_as.png
diff --git a/mhn/img/pmd/table.png b/mhn/img/designer/table.png
similarity index 100%
rename from mhn/img/pmd/table.png
rename to mhn/img/designer/table.png
diff --git a/mhn/img/pmd/toggle_lines.png b/mhn/img/designer/toggle_lines.png
similarity index 100%
rename from mhn/img/pmd/toggle_lines.png
rename to mhn/img/designer/toggle_lines.png
diff --git a/mhn/img/pmd/uparrow2_m.png b/mhn/img/designer/uparrow2_m.png
similarity index 100%
rename from mhn/img/pmd/uparrow2_m.png
rename to mhn/img/designer/uparrow2_m.png
diff --git a/mhn/img/pmd/viewInFullscreen.png b/mhn/img/designer/viewInFullscreen.png
similarity index 100%
rename from mhn/img/pmd/viewInFullscreen.png
rename to mhn/img/designer/viewInFullscreen.png
diff --git a/mhn/info.inc.php b/mhn/info.inc.php
deleted file mode 100644
index 88ded351d..000000000
--- a/mhn/info.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$theme_name = 'mhn';
-$theme_full_version = '1.3';
diff --git a/mhn/sprites.lib.php b/mhn/sprites.lib.php
deleted file mode 100644
index 56ea19049..000000000
--- a/mhn/sprites.lib.php
+++ /dev/null
@@ -1,819 +0,0 @@
-<?php
-/**
- * AUTOGENERATED CONTENT - DO NOT EDIT!
- * ALL CHANGES WILL BE UNDONE!
- * RUN `./scripts/generate-sprites` TO UPDATE THIS FILE
- *
- * @package PhpMyAdmin-theme
- */
-
-/**
- * Returns map of sprites inside sprite.png
- *
- * @return array Data of sprites
- */
-function PMA_sprites()
-{
-    return array(
-        'asc_order' => array(
-            'position' => '1',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_bookmark' => array(
-            'position' => '2',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_browse' => array(
-            'position' => '3',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_calendar' => array(
-            'position' => '4',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_chart' => array(
-            'position' => '5',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_close' => array(
-            'position' => '6',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_column_add' => array(
-            'position' => '7',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_comment' => array(
-            'position' => '8',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_dbstatistics' => array(
-            'position' => '9',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_deltbl' => array(
-            'position' => '10',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_docs' => array(
-            'position' => '11',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_docsql' => array(
-            'position' => '12',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_drop' => array(
-            'position' => '13',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_edit' => array(
-            'position' => '14',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_empty' => array(
-            'position' => '15',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_engine' => array(
-            'position' => '16',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_event_add' => array(
-            'position' => '17',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_events' => array(
-            'position' => '18',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_export' => array(
-            'position' => '19',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_favorite' => array(
-            'position' => '20',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_find_replace' => array(
-            'position' => '21',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_firstpage' => array(
-            'position' => '22',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_ftext' => array(
-            'position' => '23',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_group' => array(
-            'position' => '24',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_help' => array(
-            'position' => '25',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_home' => array(
-            'position' => '26',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_import' => array(
-            'position' => '27',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_index' => array(
-            'position' => '28',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_index_add' => array(
-            'position' => '29',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_info' => array(
-            'position' => '30',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        'b_inline_edit' => array(
-            'position' => '31',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_insrow' => array(
-            'position' => '32',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_lastpage' => array(
-            'position' => '33',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_minus' => array(
-            'position' => '34',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_more' => array(
-            'position' => '35',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_move' => array(
-            'position' => '36',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_newdb' => array(
-            'position' => '37',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_newtbl' => array(
-            'position' => '38',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_nextpage' => array(
-            'position' => '39',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_no_favorite' => array(
-            'position' => '40',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_pdfdoc' => array(
-            'position' => '41',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_plus' => array(
-            'position' => '42',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_prevpage' => array(
-            'position' => '43',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_primary' => array(
-            'position' => '44',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_print' => array(
-            'position' => '45',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_props' => array(
-            'position' => '46',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_relations' => array(
-            'position' => '47',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_report' => array(
-            'position' => '48',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_routine_add' => array(
-            'position' => '49',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_routines' => array(
-            'position' => '50',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_save' => array(
-            'position' => '51',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_saveimage' => array(
-            'position' => '52',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sbrowse' => array(
-            'position' => '53',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sdb' => array(
-            'position' => '54',
-            'width'    => '10',
-            'height'   => '10'
-        ),
-        'b_search' => array(
-            'position' => '55',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_selboard' => array(
-            'position' => '56',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_select' => array(
-            'position' => '57',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_snewtbl' => array(
-            'position' => '58',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_spatial' => array(
-            'position' => '59',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sql' => array(
-            'position' => '60',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sqldoc' => array(
-            'position' => '61',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_sqlhelp' => array(
-            'position' => '62',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_table_add' => array(
-            'position' => '63',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblanalyse' => array(
-            'position' => '64',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblexport' => array(
-            'position' => '65',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblimport' => array(
-            'position' => '66',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tblops' => array(
-            'position' => '67',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tbloptimize' => array(
-            'position' => '68',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_tipp' => array(
-            'position' => '69',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_trigger_add' => array(
-            'position' => '70',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_triggers' => array(
-            'position' => '71',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_undo' => array(
-            'position' => '72',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_unique' => array(
-            'position' => '73',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usradd' => array(
-            'position' => '74',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrcheck' => array(
-            'position' => '75',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrdrop' => array(
-            'position' => '76',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usredit' => array(
-            'position' => '77',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_usrlist' => array(
-            'position' => '78',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_versions' => array(
-            'position' => '79',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_view' => array(
-            'position' => '80',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_view_add' => array(
-            'position' => '81',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'b_views' => array(
-            'position' => '82',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_browse' => array(
-            'position' => '83',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_deltbl' => array(
-            'position' => '84',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_drop' => array(
-            'position' => '85',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_edit' => array(
-            'position' => '86',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_empty' => array(
-            'position' => '87',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_export' => array(
-            'position' => '88',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_firstpage' => array(
-            'position' => '89',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_ftext' => array(
-            'position' => '90',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_index' => array(
-            'position' => '91',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_insrow' => array(
-            'position' => '92',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_lastpage' => array(
-            'position' => '93',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_nextpage' => array(
-            'position' => '94',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_prevpage' => array(
-            'position' => '95',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_primary' => array(
-            'position' => '96',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_routine_add' => array(
-            'position' => '97',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_sbrowse' => array(
-            'position' => '98',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_select' => array(
-            'position' => '99',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_spatial' => array(
-            'position' => '100',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'bd_unique' => array(
-            'position' => '101',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns' => array(
-            'position' => '102',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns_add' => array(
-            'position' => '103',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'centralColumns_delete' => array(
-            'position' => '104',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'col_drop' => array(
-            'position' => '105',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'console' => array(
-            'position' => '106',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'database' => array(
-            'position' => '107',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'eye' => array(
-            'position' => '108',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'eye_grey' => array(
-            'position' => '109',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'item' => array(
-            'position' => '110',
-            'width'    => '9',
-            'height'   => '9'
-        ),
-        'lightbulb' => array(
-            'position' => '111',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'lightbulb_off' => array(
-            'position' => '112',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'more' => array(
-            'position' => '113',
-            'width'    => '13',
-            'height'   => '16'
-        ),
-        'new_data' => array(
-            'position' => '114',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_hovered' => array(
-            'position' => '115',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_selected' => array(
-            'position' => '116',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_data_selected_hovered' => array(
-            'position' => '117',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct' => array(
-            'position' => '118',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_hovered' => array(
-            'position' => '119',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_selected' => array(
-            'position' => '120',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'new_struct_selected_hovered' => array(
-            'position' => '121',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'normalize' => array(
-            'position' => '122',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'pause' => array(
-            'position' => '123',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'php_sym' => array(
-            'position' => '124',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'play' => array(
-            'position' => '125',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_asc' => array(
-            'position' => '126',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_asci' => array(
-            'position' => '127',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_attention' => array(
-            'position' => '128',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_cancel' => array(
-            'position' => '129',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_cancel2' => array(
-            'position' => '130',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_cog' => array(
-            'position' => '131',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_db' => array(
-            'position' => '132',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_desc' => array(
-            'position' => '133',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_error' => array(
-            'position' => '134',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_error2' => array(
-            'position' => '135',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        's_host' => array(
-            'position' => '136',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_info' => array(
-            'position' => '137',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_lang' => array(
-            'position' => '138',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_link' => array(
-            'position' => '139',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_lock' => array(
-            'position' => '140',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_loggoff' => array(
-            'position' => '141',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_notice' => array(
-            'position' => '142',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_okay' => array(
-            'position' => '143',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_passwd' => array(
-            'position' => '144',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_process' => array(
-            'position' => '145',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_really' => array(
-            'position' => '146',
-            'width'    => '11',
-            'height'   => '11'
-        ),
-        's_reload' => array(
-            'position' => '147',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_replication' => array(
-            'position' => '148',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_rights' => array(
-            'position' => '149',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_sortable' => array(
-            'position' => '150',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_status' => array(
-            'position' => '151',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_success' => array(
-            'position' => '152',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_sync' => array(
-            'position' => '153',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_tbl' => array(
-            'position' => '154',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_theme' => array(
-            'position' => '155',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_top' => array(
-            'position' => '156',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_unlink' => array(
-            'position' => '157',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_vars' => array(
-            'position' => '158',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        's_views' => array(
-            'position' => '159',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-        'window-new' => array(
-            'position' => '160',
-            'width'    => '16',
-            'height'   => '16'
-        ),
-    );
-}
diff --git a/mhn/theme.json b/mhn/theme.json
index 3b1018a33..5b3619bef 100644
--- a/mhn/theme.json
+++ b/mhn/theme.json
@@ -1,9 +1,9 @@
 {
     "name": "mhn",
-    "version": "1.3",
+    "version": "1.4",
     "description": "Flat Theme for phpMyAdmin",
     "author": "Mohan Khadka",
     "url": "http://www.mohankhadka.com.np/",
-    "supports": ["4.7"]
+    "supports": ["4.8"]
 }