diff --git a/interface/web/themes/default-v2/CHANGELOG b/interface/web/themes/default-v2/CHANGELOG
new file mode 100644
index 0000000000000000000000000000000000000000..b9e98bea44e2698f5fcace212ac60b4da9a1bf31
--- /dev/null
+++ b/interface/web/themes/default-v2/CHANGELOG
@@ -0,0 +1,20 @@
+CHANGELOG
+default -> default-v2
+source: default $3241 07/06/2012 @ 12:00 UTC+2
+
+- rm yaml/*
+- rm css/patches/*
+- cp yaml/patches/iehacks.css css/*
+- rm <!--[if lte ie 6]> from templates/main.tpl.htm
+- rm IE6 support from css/iehacks.css
+- mv css/nav/* into css/style.css
+- mv css/print/* into css/print.css
+- add css/print.css to templates/main.tpl.htm
+- rm css/print/*
+- rm css/nav/*
+- rm css projection-type support
+- mv css/screen/redmond/* css/*
+- rm css/screen/*
+- mv css media-recognition from css-files to <head>-link tag
+- change most div-containers to new html5 tags in main.tpl.htm
+- 
diff --git a/interface/web/themes/default-v2/css/iehacks.css b/interface/web/themes/default-v2/css/iehacks.css
new file mode 100644
index 0000000000000000000000000000000000000000..a6048da9efa6405e74471d319a56bb842f5d542c
--- /dev/null
+++ b/interface/web/themes/default-v2/css/iehacks.css
@@ -0,0 +1,184 @@
+@charset "UTF-8";
+/**
+ * "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework
+ *
+ * (en) YAML core stylesheet - structure-independent bugfixes of IE/Win CSS-bugs
+ * (de) YAML Basis-Stylesheet - Strukturunabhängige Bugfixes von CSS-Bugs des IE/Win
+ *
+ * Don't make any changes in this file!
+ * Your changes should be added to a separate patch-file.
+ *
+ * @copyright       Copyright 2005-2008, Dirk Jesse
+ * @license         CC-A 2.0 (http://creativecommons.org/licenses/by/2.0/),
+ *                  YAML-C (http://www.yaml.de/en/license/license-conditions.html)
+ * @link            http://www.yaml.de
+ * @package         yaml
+ * @version         3.0.6
+ * @revision        $Revision: 202 $
+ * @lastmodified    $Date: 2008-06-07 14:29:18 +0200 (Sa, 07 Jun 2008) $
+ * @appdef yaml
+ */
+
+@media all
+{
+  /**
+   * (en) Debugging: When you see a green background, IE is getting this stylesheet
+   * (de) Fehlersuche: Hintergrund leuchtet grün, wenn das Stylesheet korrekt geladen wurde
+   *
+   * @debug
+   * @app-yaml-default disabled
+   */
+
+  /* body { background: #0f0; background-image: none; }  */
+
+  /*------------------------------------------------------------------------------------------------------*/
+
+  /**
+   * (en) Forcing vertical scrollbars is not needed in IE (only for Firefox/Netscape/Safari)
+   * (de) Erzwingen vertikaler Scrollbalken im IE nicht benötigt (nur im Firefox/Netscape/Safari)
+   *
+   * @workaround
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      yes
+   */
+
+  html { height: auto; margin-bottom:0; }
+
+  /*------------------------------------------------------------------------------------------------------*/
+
+   /**
+   * (en) Stability fixes with 'position:relative' 
+   * (de) Stabilitätsverbesserungen durch 'position:relative'
+   *
+   * @bugfix
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      yes
+   */
+
+  body { position:relative; }  /* Essential in IE7 for correct layout scaling ... */
+  * html body { position:static; }  /* ... but not for IE5.x and IE6 */
+  #main { position: relative; } /* helpful for several problems in older IE versions*/
+
+  /*------------------------------------------------------------------------------------------------------*/
+
+  /**
+   * (en) Clearfix Method for containing floats in IE
+   * (de) Clearfix-Anpassung für diverse IE-Versionen
+   *
+   * @workaround
+   * @see        http://www.456bereastreet.com/archive/200603/new_clearing_method_needed_for_ie7/#comment28
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      yes
+   */
+
+
+  .clearfix { display: inline-block; }  /* ... especial for IE7 */
+  .clearfix { display: block; }      /* ... für IE5,IE6,IE7 */
+  * html .clearfix { height: 1%; }   /* ... für IE5 + IE6/Win | hasLayout aktivieren */
+
+  /*------------------------------------------------------------------------------------------------------*/
+
+  /**
+   * (en) Preventing several css bugs by forcing "hasLayout"
+   * (de) Vermeidung verschiedenster Bugs durch Erzwingen von "hasLayout"
+   *
+   * @workaround
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      no
+   */
+   
+  body { height: 1%; }
+  #page_margins, #page, #header, #nav, #main, #footer { zoom:1; }             /* IE6 & IE7    */
+  #page_margins, #page { height: 1%; }                                        /* IE 5.x       */
+  * html #header, * html #nav, * html #main, * html #footer { width: 100%; }  /* IE 5.x & IE6 */
+  * html #header, * html #nav, * html #main, * html #footer { wid\th: auto; } /* IE 6         */
+
+  /*------------------------------------------------------------------------------------------------------*/
+
+  /**
+   * List-Numbering Bug
+   *
+   * @bugfix
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      yes
+   */
+  body ol li { display:list-item; }
+  
+  /*------------------------------------------------------------------------------------------------------*/
+
+  /**
+   * (en) Workaround for 'collapsing margin at #col3' when using CSS-property clear
+   *      Left margin of #col3 collapses when using clear:both in 1-3-2 (or 2-3-1) layout and right column is the
+   *      longest and left column is the shortest one. For IE6 and IE7 a special workaround was developed
+   *      in YAML.
+   *
+   * (de) Workaround für 'kollabierenden Margin an #col3' bei Verwendung der CSS-Eigenschaft clear
+   *      Der linke Margin von #col3 kollabiert bei der Verwendung von clear:both im 1-3-2 (oder 2-3-1) Layout
+   *      wenn gleichzeitig die rechte Spalte die kürzeste und die rechte die Längste ist. Im IE6 und IE7 lässt
+   *      sich der Bug durch eine speziell für YAML entwickelten Workaround umgehen.
+   *
+   * @workaround
+   * @affected   IE 5.x/Win, IE6, IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      no
+   */
+
+  #ie_clearing {
+    /* (en) Only a small help for debugging */
+    /* (de) Nur eine kleine Hilfe zur Fehlersuche */
+    position:static;
+
+    /* (en) Make container visible in IE */
+    /* (de) Container sichtbar machen im IE */
+    display:block;
+
+    /* (en) No fix possible in IE5.x, normal clearing used instead */
+    /* (de) Kein Fix im IE5.x möglich, daher normales Clearing */
+    \clear:both;
+
+    /* (en) forcing clearing-like behavior with a simple oversized container in IE6 & IE7*/
+    /* (de) IE-Clearing mit 100%-DIV für IE6 bzw. übergroßem Container im IE7 */
+    width: 100%;
+    font-size:0px;
+    margin: -2px 0 -1em 1px;
+  }
+
+  * html #ie_clearing { margin: -2px 0 -1em 0; }
+  #col3_content {margin-bottom:-2px; }
+
+  /* (en) avoid horizontal scrollbars in IE7 in borderless layouts because of negative margins */
+  /* (de) Vermeidung horizontaler Scrollbalken bei randabfallenden Layouts im IE7 */
+  html { margin-right: 1px; }
+  * html { margin-right: 0 }
+
+
+  /* (en) Bugfix: Essential for IE7 */
+  /* (de) Bugfix: Notwendig im IE7 */
+  #col3 { position:relative; z-index: -1; }
+
+  /*------------------------------------------------------------------------------------------------------*/
+}
+
+@media screen, projection
+{
+  }
+
+@media print
+{
+  /**
+   * (en) Avoid unneeded page breaks of #col3 content in print layout.
+   * (de) Vermeiden von unnötigen Seitenumbrüchen beim Ausdruck der Spalte #col3.
+   *
+   * @bugfix
+   * @affected   IE7
+   * @css-for    IE 5.x/Win, IE6, IE7
+   * @valid      yes
+   */
+
+  #col3 { height: 1%; }
+}
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/interface/web/themes/default-v2/css/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b5dab2ab7b1c50dea9cfe73dc5a269a92d2d4b4
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_flat_55_fbec88_40x100.png b/interface/web/themes/default-v2/css/images/ui-bg_flat_55_fbec88_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..47acaadd737478ddb090f47f618810712163317b
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-bg_flat_55_fbec88_40x100.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_glass_75_d0e5f5_1x400.png b/interface/web/themes/default-v2/css/images/ui-bg_glass_75_d0e5f5_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fb564f8d0a117f17aa6b844490309dadbd94821
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-bg_glass_75_d0e5f5_1x400.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_glass_85_dfeffc_1x400.png b/interface/web/themes/default-v2/css/images/ui-bg_glass_85_dfeffc_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..014951529c315d6042e72febc310a4d2db5b4a82
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-bg_glass_85_dfeffc_1x400.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_glass_95_fef1ec_1x400.png b/interface/web/themes/default-v2/css/images/ui-bg_glass_95_fef1ec_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..4443fdc1a156babad4336f004eaf5ca5dfa0f9ab
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-bg_glass_95_fef1ec_1x400.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/interface/web/themes/default-v2/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..81ecc362d50ef5abbc0420aacd5345822f1f6098
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f3faf8aa8b1054ef1b18b80ab58f670b406a794
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_f5f8f9_1x100.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..38c38335d0919ceb7b0dd09e88a86be90a966ef3
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-bg_inset-hard_100_fcfdfd_1x100.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_217bc0_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_217bc0_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f4bd87c041453ef037c4a9a1a698f0105d02eba
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-icons_217bc0_256x240.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_2e83ff_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_2e83ff_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..09d1cdc856c292c4ab6dd818c7543ac0828bd616
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-icons_2e83ff_256x240.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_469bdd_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_469bdd_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd2cf079add1ca236adeb509698adabbffb08acb
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-icons_469bdd_256x240.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_6da8d5_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_6da8d5_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f3eafaab0f048da81e1e072c3091282742c4980
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-icons_6da8d5_256x240.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_cd0a0a_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_cd0a0a_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ab019b73ec11a485fa09378f3a0e155194f6a5d
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-icons_cd0a0a_256x240.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_d8e7f3_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_d8e7f3_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad2dc6f9dbeeabbda9ae6917659b6df07817ec35
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-icons_d8e7f3_256x240.png differ
diff --git a/interface/web/themes/default-v2/css/images/ui-icons_f9bd01_256x240.png b/interface/web/themes/default-v2/css/images/ui-icons_f9bd01_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7c53cb11904843e176e4ce1f4e7247cd90b3590
Binary files /dev/null and b/interface/web/themes/default-v2/css/images/ui-icons_f9bd01_256x240.png differ
diff --git a/interface/web/themes/default-v2/css/jquery-ui-1.8.16.custom.css b/interface/web/themes/default-v2/css/jquery-ui-1.8.16.custom.css
new file mode 100644
index 0000000000000000000000000000000000000000..88353fe6a8df26718f7db109ad8f833629517295
--- /dev/null
+++ b/interface/web/themes/default-v2/css/jquery-ui-1.8.16.custom.css
@@ -0,0 +1,444 @@
+/*
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande,%20Lucida%20Sans,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=0px&bgColorHeader=5c9ccc&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=06_inset_hard.png&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=02_glass.png&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=06_inset_hard.png&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=e17009&iconColorActive=f9bd01&bgColorHighlight=fbec88&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fad42e&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=0px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header a { color: #ffffff; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2e6e9e; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1d5987; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #1d5987; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #79b7e7; background: #f5f8f9 url(images/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #e17009; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #e17009; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fad42e; background: #fbec88 url(images/ui-bg_flat_55_fbec88_40x100.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_469bdd_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_469bdd_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_d8e7f3_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_6da8d5_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_217bc0_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_f9bd01_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }/*
+ * jQuery UI Autocomplete 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.16
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; }
+button.ui-button-icons-only { width: 3.7em; }
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Datepicker 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/css/print.css b/interface/web/themes/default-v2/css/print.css
new file mode 100644
index 0000000000000000000000000000000000000000..ede8d4a2338b9e124673865cea426ae7e27b63e0
--- /dev/null
+++ b/interface/web/themes/default-v2/css/print.css
@@ -0,0 +1,112 @@
+@charset "UTF-8";
+/* 
+    Document   : print.css
+    Created on : 06.07.2012, 12:21:59
+    Author     : Christian Foellmann (foe-services.de)
+    Description:
+        Basis was css-code from the "ISPConfig 3: default theme" which was based on
+        "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework 3.0.6
+        by Copyright 2005-2008, Dirk Jesse (http://www.yaml.de)
+*/
+
+#col1, #col1_content { float:none; width: 100%; margin: 0; padding: 0; border: 0; }
+
+#col2 { display:none; }
+#col3 { display:none; }
+/*------------------------------------------------------------------------------------------------------*/
+
+/**
+ * @section layout preparation
+ * @see     http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html
+*/
+
+/* (en) Preparing base layout for print */
+/* (de) Basislayout für Druck aufbereiten */
+body, #page_margins, #page, #main { margin:0; padding: 0; border: 0; }
+#page_margins, #page { width: 100% !important; min-width:0; max-width: none; }
+#header { height: auto; }
+
+/* (en) Hide unneeded container of the screenlayout in print layout */
+/* (de) Für den Druck nicht benötigte Container des Layouts abschalten */
+#topnav, #nav, #search, #footer { display: none; }
+
+/* (en) Linearising subtemplates */
+/* (de) Linearisierung der Subtemplates */
+.c25l, .c33l, .c38l, .c50l, .c62l, .c66l, .c75l,
+.c25r, .c33r, .c38r, .c50r, .c62r, .c66r, .c75r {
+    width: 100%; margin:0; float:none; overflow:visible; display:table;
+}
+.subc, .subcl, .subcr  { margin: 0; padding: 0; }
+
+/* (en) make .print class visible */
+/* (de) .print-Klasse sichtbar schalten */
+.print { position: static; top: 0; left: 0; height: auto; width: auto; }
+
+/*------------------------------------------------------------------------------------------------------*/
+
+/**
+ * @section content preparation
+ * @see     http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html
+*/
+
+/* (en) Change font to serif */
+/* (de) Zeichensatz auf Serifen umstellen */
+body * { font-family: "Times New Roman", Times, serif; }
+code, pre { font-family:"Courier New", Courier, mono; }
+body { font-size: 12pt; }
+
+/* (en) Avoid page breaks right after headings */
+/* (de) Vermeidung von Seitenumbrüchen direkt nach einer Überschrift */
+h1,h2,h3,h4,h5,h6 { page-break-after:avoid; }
+
+/* (en) Format acronyms and abbreviations for print*/
+/* (de) Auszeichnung von Abkürzungen */
+abbr[title]:after, 
+acronym[title]:after { content: '(' attr(title) ')'; }
+
+/* (en) Disable background graphics of links  */
+/* (de) Abschalten evlt. vorhandener Hintergrundgrafiken zur Linkkennzeichnung */
+#page a[href^="http:"], 
+#page a[href^="https:"] { padding-left: 0; background-image: none; }
+
+/* (en) Enable URL output in print layout */
+/* (de) Sichtbare Auszeichnung der URLs von Links */
+a[href]:after {
+    content:" <URL: "attr(href)">";
+    color:#444;
+    background:inherit;
+    font-style:italic;
+}
+
+/* (en) Preparation for optional column labels */
+/* (de) Vorbereitung für optionale Spaltenauszeichnung */
+#col1_content:before, #col2_content:before, #col3_content:before {
+    content: "";
+    color:#888;
+    background:inherit;
+    display:block;
+    font-weight:bold;
+    font-size:1.5em;
+}
+
+/*------------------------------------------------------------------------------------------------------*/
+
+/**
+ * @section browser fixes for print layouts
+ * @see     http://www.yaml.de/en/documentation/css-components/layout-for-print-media.html
+*/
+
+/**
+ * (en) overflow:hidden Bug in print layouts
+ * (de) overflow:hidden Bug in Drucklayouts
+ *
+ * @bugfix
+ * @since     3.0
+ * @affected  FF2.0, IE7
+ * @css-for   all browsers
+ * @valid     yes
+*/
+
+.floatbox,
+.subcolumns, 
+.subcolums_oldgecko { overflow:visible; display: table; }
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/css/styles.css b/interface/web/themes/default-v2/css/styles.css
new file mode 100644
index 0000000000000000000000000000000000000000..cdb19ac4ae27ea83be2edbf47f6d599f2a77881f
--- /dev/null
+++ b/interface/web/themes/default-v2/css/styles.css
@@ -0,0 +1,1830 @@
+@charset "UTF-8";
+/* 
+    Document   : styles.css
+    Created on : 06.07.2012, 12:21:59
+    Author     : Christian Foellmann (foe-services.de)
+    Description:
+        Basis was css-code from the "ISPConfig 3: default theme" which was based on
+        "Yet Another Multicolumn Layout" - (X)HTML/CSS Framework 3.0.6
+        by Copyright 2005-2008, Dirk Jesse (http://www.yaml.de)
+*/
+
+/* overall
+-------------------------------------------------------------- */
+* {
+    margin: 0;
+    padding: 0;
+}
+header, #nav, #main, footer {
+    clear: both;
+}
+ul, ol, dl {
+    margin: 0 0 1em 1em;
+}
+.skip, .hideme, .print {
+    height: 1px;
+    left: -1000em;
+    position: absolute;
+    top: -1000em;
+    width: 1px;
+}
+
+/* header
+-------------------------------------------------------------- */
+header {
+    position: relative;
+    color: #faf0e6;
+    padding: 15px 2em 5px 20px;
+    background: #9a9a9a url(../images/header_bg.png) repeat-x top left;
+}
+header h1 {
+    font-size:2.5em;
+    letter-spacing:-2px;
+    line-height:65%;
+    color: silver;
+}
+header span {
+    color: #333333;
+}
+
+/* header/topsubnav
+-------------------------------------------------------------- */
+#topsubnav {
+    position:absolute;
+    top: 10px;
+    right: 10px;
+    text-align: right;
+}
+#topsubnav a { color: #f0f8ff; font-weight: normal; background:transparent; text-decoration:none; }
+#topsubnav a:focus, 
+#topsubnav a:hover,
+#topsubnav a:active { text-decoration:underline; background-color: transparent;}
+
+/* nav
+    TODO: sprite image
+-------------------------------------------------------------- */
+#topNav ul {
+    list-style: none;
+    padding: 0 0 0 20px;
+    margin: 0;
+    background: #9a9a9a
+}
+
+#topNav ul li {
+    display: inline;
+    margin: 0 2px 0 0;
+}
+
+#topNav a {
+    background-color: #D3D3D3;
+    background-position: center 5px;
+    background-repeat: no-repeat;
+    color:black;
+    display:inline-block;
+    height:20px;
+    padding-top:37px;
+    text-align:center;
+    text-decoration:none;
+    width:78px;
+}
+
+#topNav a:hover {
+    background-color: #eeeeee;
+    color: #000000;
+}
+
+#topNav #topNav_current {
+}
+
+#topNav #topNav_current a {
+    font-weight: bold;
+    color: black;
+    background-color: #ffffff;
+}
+
+.topnav-admin {
+    background-image: url('../icons/x32/system.png') !important;
+}
+
+.topnav-client {
+    background-image: url('../icons/x32/client.png') !important;
+}
+
+.topnav-mail {
+    background-image: url('../icons/x32/email.png') !important;
+}
+
+.topnav-mailuser {
+    background-image: url('../icons/x32/email.png') !important;
+}
+
+.topnav-monitor {
+    background-image: url('../icons/x32/monitor.png') !important;
+}
+
+.topnav-sites {
+    background-image: url('../icons/x32/sites.png') !important;
+}
+
+.topnav-dns {
+    background-image: url('../icons/x32/dns.png') !important;
+}
+
+.topnav-tools {
+    background-image: url('../icons/x32/tools.png') !important;
+}
+
+.topnav-help {
+    background-image: url('../icons/x32/help.png') !important;
+}
+
+.topnav- {
+    background-image: url('../icons/x32/login.png') !important;
+}
+
+.topnav-domain {
+    background-image: url('../icons/x32/domain.png') !important;
+}
+
+.topnav-dashboard {
+    background-image: url('../icons/x32/dashboard.png') !important;
+}
+
+.topnav-vm{
+    background-image: url('../icons/x32/drawer.png') !important;
+}
+
+.topnav-billing{
+    background-image: url('../icons/x32/calculator.png') !important;
+}
+
+/* main
+-------------------------------------------------------------- */
+#main { 
+    background: #fff;
+    padding: 1em 0;
+}
+
+/* main/sideNav + submenu
+-------------------------------------------------------------- */
+#sideNav { width: 200px; 
+           float:left;
+           padding: 0 10px 0 0; 
+}
+
+#submenu {
+    width: 100%;
+    overflow: hidden;
+    margin: 0px;
+    list-style-type: none;
+    border-bottom: 2px #ddd solid;
+}
+
+#submenu ul { list-style-type: none; margin:0; padding: 0; }
+#submenu li { float:left; width: 100%; margin:0; padding: 0; font-size:0.9em; }
+
+#submenu a,
+#submenu strong {
+    display:block;
+    width: 90%;
+    padding: 2px 0px 2px 10%;
+    text-decoration: none;
+    background-color:#fff;
+    color: #444;
+    border-bottom: 1px #eee solid;
+}
+
+/* Menu Title */
+#submenu li.title {
+    width: 100%;
+    padding: 0px;
+    font-weight: bold;
+    color: #444;
+    background-color: #fff;
+    border-top: 2px #888 solid;
+    font-size: 1.1em;
+}
+
+#submenu li.title a {
+    background-color: #f0f8ff;
+    color: #444;
+}
+#submenu li.title a:hover {
+    color: white;
+}
+
+#submenu li span {
+    display:block;
+    width: 90%;
+    padding: 3px 0px 3px 10%;
+    font-weight: bold;
+    border-bottom: 1px #ddd solid;
+}
+
+/* Level 1 */
+#submenu li.active,
+#submenu li strong {
+    width: 90%;
+    padding: 3px 0px 3px 10%;
+    font-weight: bold;
+    color: #fff;
+    background-color:#aab;
+    border-bottom: 1px #eee solid;
+}
+
+#submenu li a { width: 90%; padding-left: 10%; background-color:#fff; color: #444; }
+#submenu li a:focus,
+#submenu li a:hover,
+#submenu li a:active { background-color:#f63; color: #fff; }
+
+/* Form-Elements in the Menu*/
+#submenu * select#server_id {
+    margin: 3px 10%;
+    padding: 1px;
+    width: 80%;
+}
+
+/* main/content
+-------------------------------------------------------------- */
+#content { 
+    margin-left: 200px; 
+    margin-right: 0;
+    padding: 0px 10px 10px 20px;
+    border-left: 1px #ddd solid;
+}
+
+/* footer
+-------------------------------------------------------------- */
+
+footer { 
+    color:#666; 
+    background: #f9f9f9;
+    padding: 10px 20px;
+    border-top: 5px #efefef solid;
+    font-size: 0.8em;
+    text-align: center;
+}
+footer a { color: #999; background:transparent; font-weight: bold;}
+footer a:hover, footer a:active {
+    color: #4D87C7; 
+    background-color: transparent; 
+    text-decoration:underline;
+}
+
+
+
+
+/* basemod
+-------------------------------------------------------------- */
+
+/**
+* (en) Formatting YAML's  basic layout elements
+* (de) Gestaltung des YAML Basis-Layouts
+*/
+
+/* (en) Marginal areas & page background */
+/* (de) Randbereiche & Seitenhintergrund */
+body { background: #EEEEEE url("../images/screen_bg.png") repeat-x top left fixed; padding: 10px 0; }
+
+/* (en) Centering layout in old IE-versions */
+/* (de) Zentrierung des Layouts in alten IE-versionen */
+body { text-align: center; }
+#page { text-align:left; margin: 0 auto; }
+
+/* (en) Layout: width, background, borders */
+/* (de) Layout: Breite, Hintergrund, Rahmen */
+/*#page_margins { min-width: 980px; max-width: 80%; background: #fff;}*/
+/* #page_margins { min-width: 980px; max-width: 80%; background: #fff; display: inline-block;}*/
+
+/*WARNING: ADded a overrode for this setting in main.tpl with javascript to target non chrome browsers,
+This has to be changed too in case that page_margins get changed. Reason: Chrome does not support the 
+display: table; attribute correctly*/
+#page { min-width: 980px; max-width: 80%; background: #fff;}
+/*#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}*/
+
+#page{ padding: 10px; }
+
+
+
+
+/* content
+-------------------------------------------------------------- */
+
+/**
+    * Fonts
+    * (en) font-family and font-size selection for headings and standard text elements
+    * (de) Zeichensatz und Schriftgrößen für Überschriften und übliche Text-Elemente
+    *
+    * @section content-fonts
+*/
+
+/* (en) reset font size for all elements to standard (16 Pixel) */
+/* (de) Alle Schriftgrößen auf Standardgröße (16 Pixel) zurücksetzen */
+html * { font-size: 100.01% }
+
+/* (en) reset monospaced elements to font size 16px in Gecko browsers */
+/* (de) Schriftgröße von monospaced Elemente auf 16 Pixel setzen */
+textarea, pre, tt, code {
+    font-family: Consolas,"Lucida Console","Courier New",monospace;
+    font-size: 0.9em;	
+}
+
+/* (en) base layout gets standard font size 12px */
+/* (de) Basis-Layout erhält Standardschriftgröße von 12 Pixeln */
+body {
+    font-family: 'Trebuchet MS', sans-serif;
+    font-size: 75.00%; 
+    color: #444;  
+}
+
+h1,h2,h3,h4,h5,h6 { 
+    font-family: 'Trebuchet MS', sans-serif;
+    font-weight:bold; 
+    color:#666;
+    margin: 0 0 0.25em 0; 
+}
+
+h1 { font-size: 200% }                        /* 24px */
+h2 { font-size: 200% }          /* 24px */
+h3 { font-size: 150% }                        /* 18px */
+h4 { font-size: 133.33% }                     /* 16px */
+h5 { font-size: 116.67% }                     /* 14px */
+h6 { font-size: 116.67%; font-style:italic }  /* 14px */
+
+
+
+p { line-height: 1.5em; margin: 0 0 1em 0; }
+
+/* ### Lists | Listen  #### */
+
+ul, ol, dl { line-height: 1.5em; margin: 0 0 1em 1em }
+li { margin-left: 1.5em; line-height: 1.5em }
+
+dt { font-weight: bold }
+dd { margin: 0 0 1em 2em }
+
+/* ### text formatting | Textauszeichnung ### */
+
+cite, blockquote { font-style:italic }
+blockquote { margin: 0 0 1em 1.5em }
+
+strong,b { font-weight: bold }
+em,i { font-style:italic }
+
+pre, code { font-family: monospace; font-size: 1.1em; }
+
+acronym, abbr {
+    letter-spacing: .07em;
+    border-bottom: .1em dashed #c00;
+    cursor: help;
+}
+
+/* Set a background-color, no system backgorund used anymore */
+select, input, textarea {
+    background: #FFFFFF;
+    border: 1px solid #DFDFDF;
+    padding: 1px;
+    outline:none;
+}
+
+
+/**
+ * Generic Content Classes
+ * (en) standard classes for positioning and highlighting
+ * (de) Standardklassen zur Positionierung und Hervorhebung
+ *
+ * @section content-generic-classes
+*/
+
+.note {background: #dfd; padding: 1em; border-top: 1px #bdb dotted; border-bottom: 1px #bdb dotted;}
+.important {background: #ffd; padding: 1em; border-top: 1px #ddb dotted; border-bottom: 1px #ddb dotted;}
+.warning {background: #fdd; padding: 1em; border-top: 1px #dbb dotted; border-bottom: 1px #dbb dotted;}
+
+.float_left { float: left; display:inline; margin-right: 1em; margin-bottom: 0.15em;  }
+.float_right { float: right; display:inline; margin-left: 1em; margin-bottom: 0.15em;  }
+.center { text-align:center; margin: 0.5em auto }
+
+/**
+ * External Links
+ *
+ * (en) Formatting of hyperlinks
+ * (de) Gestaltung von Hyperlinks
+ *
+*/
+
+a {color: #4D87C7; text-decoration:none;}
+a:focus,
+a:hover,
+a:active {color:#182E7A; text-decoration:underline;}
+
+
+
+
+
+/**
+ * (en) Emphasizing external Hyperlinks via CSS
+ * (de) Hervorhebung externer Hyperlinks mit CSS
+ *
+ * @section             content-external-links
+ * @app-yaml-default    disabled
+*/
+
+/*
+#main a[href^="http://www.my-domain.com"],
+#main a[href^="https://www.my-domain.com"]
+{
+  padding-left: 12px;
+  background-image: url('your_image.gif');
+  background-repeat: no-repeat;
+  background-position: 0 0.45em;
+}
+*/
+
+/**
+ * Tables | Tabellen
+ * (en) Generic classes for table-width and design definition
+ * (de) Generische Klassen für die Tabellenbreite und Gestaltungsvorschriften für Tabellen
+ *
+ * @section content-tables
+*/
+
+table { width: auto; border-collapse:collapse; margin-bottom: 0.5em; }
+table.full { width: 100%; }
+table.fixed { table-layout:fixed }
+
+table.list td{max-width:350px;min-width: 32px;white-space: nowrap;overflow:hidden;text-overflow: ellipsis; -o-text-overflow: ellipsis; -icab-text-overflow: ellipsis; -khtml-text-overflow: ellipsis; -moz-text-overflow: ellipsis; -webkit-text-overflow: ellipsis;}
+th,td { padding: 0.5em;text-align:left;}
+thead th { background: #444 url(../images/lists_thead_bg.png) repeat-x; color: #fff }
+tbody th { background: #ccc; color: #333 }
+tbody th.sub { background: #ddd; color: #333 }
+
+/**
+ * Miscellaneous | Sonstiges
+ *
+ * @section content-misc
+*/
+
+hr {
+    color: #fff;
+    background:transparent;
+    margin: 0 0 0.5em 0;
+    padding: 0 0 0.5em 0;
+    border:0;
+    border-bottom: 1px #eee solid;
+}
+
+/* Sorting cusror and backgorund */
+.pnl_listarea th[class^="tbl_col"]{cursor:pointer}
+.pnl_listarea th[class^="tbl_col"]:hover{background-position:0 -15px!important}
+
+/* content_ispc
+-------------------------------------------------------------- */
+
+.pageForm_description {
+    font-size: 12px;
+}
+
+/* Tab-Box */
+.tabbox_tabs {
+    border-bottom: 1px solid #d3d3d3;
+}
+.tabbox_tabs ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+.tabbox_tabs li {
+    display: inline;
+    margin: 0 2px 0 0;
+}
+.tabbox_tabs a {
+    padding: 0 1em;
+    text-decoration: none;
+    color: black;
+    background: #d3d3d3;
+    border: 1px solid #d3d3d3;
+}
+.tabbox_tabs a:hover {
+    background: #fc0;
+    color: #540;
+}
+.tabbox_tabs .active a {
+    font-weight: bold;
+    color: #ff6600;
+    background: #ffffff;
+}
+
+.pnl_toolsarea fieldset, .pnl_listarea fieldset, .pnl_formsarea fieldset {
+    border-top: 1px solid #949494;
+    margin: 20px 0;
+}
+.pnl_toolsarea fieldset legend , .pnl_listarea fieldset legend {
+    font-weight: bold;
+    color: #6299c5;
+}
+.pnl_formarea fieldset {
+    font-weight: bold;
+}
+
+/* hide line and legend when inside tabbed content */
+#tabbox_content * .pnl_toolsarea fieldset, #tabbox_content * .pnl_listarea fieldset, #tabbox_content * .pnl_formsarea fieldset { border: none !important; }
+#tabbox_content * .pnl_toolsarea fieldset legend, #tabbox_content * .pnl_listarea fieldset legend, #tabbox_content * .pnl_formsarea fieldset legend { display: none !important; }
+
+.codeview {
+    margin:20px 0;
+    padding:2px;
+    border: 1px solid #ffcc00;
+    background: #fffaea;
+    font-family: Consolas, "Lucida Console", "Courier New", monospace;
+    font-size: 0.9em;
+}
+
+/* Lists */
+table.list {
+    width: 100%;
+    border: 1px solid #d3d3d3 !important;
+}
+table.list thead th { font-size: 10px; }
+table.list tbody { border: 1px solid #d3d3d3 !important; }
+table.list tfoot td { text-align: center;  background: #f8f8f8 url(../images/lists_tfoot_bg.png) repeat-x bottom left;  padding: 24px 8px 8px 8px; }
+table.list .tbl_row_even { background: #fcfcfc; }
+table.list .tbl_row_uneven { background: #f0f8ff; }
+table.list tr:hover { background: #fffacd; }
+table.list td { word-wrap:break-word;white-space:pre-wrap; }
+table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal; }
+
+/* Password Strength */
+#passBar {
+    width: 101px; height: 10px;
+    background: url(../images/meter_bg.gif) repeat-x bottom left;
+    margin: 2px 0;
+    float: left;
+}
+#passText {
+    padding: 0;
+    float: left;
+}
+
+/* Systemmonitor */
+.systemmonitor-state {
+    margin: 10px 5px;
+    font-family: Consolas, "Lucida Console", "Courier New", monospace;
+    font-size: 0.9em;
+    float: left;
+    width: 100%;
+}
+.systemmonitor-state.state-no_state {
+    border-top: 4px solid #95A19F;
+    background-color: #f8f8ff;
+}
+.systemmonitor-state.state-unknown {
+    border-top: 4px solid #30302e;
+    background-color: #cecfc5;
+}
+.systemmonitor-state.state-ok {
+    border-top: 4px solid #23fb00;
+    background-color: #adffa2;
+}
+.systemmonitor-state.state-info {
+    border-top: 4px solid #183e99;
+    background-color: #d4e2ff;
+}
+.systemmonitor-state.state-warning {
+    border-top: 4px solid #ffa800;
+    background-color: #ffda93;
+}
+.systemmonitor-state.state-critical {
+    border-top: 4px solid #ff0000;
+    background-color: #ffb9b9;
+}
+.systemmonitor-state.state-error {
+    border-top: 4px solid #ff0000;
+    background-color: #ff7f7f;
+}
+.systemmonitor-state.state-no_state-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #95A19F;
+    background-color: #f8f8ff;
+}
+.systemmonitor-state.state-unknown-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #30302e;
+    background-color: #cecfc5;
+}
+.systemmonitor-state.state-ok-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #23fb00;
+    background-color: #adffa2;
+}
+.systemmonitor-state.state-info-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #183e99;
+    background-color: #d4e2ff;
+}
+.systemmonitor-state.state-warning-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #ffa800;
+    background-color: #ffda93;
+}
+.systemmonitor-state.state-critical-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #ff0000;
+    background-color: #ffb9b9;
+}
+.systemmonitor-state.state-error-ve {
+    float: left;
+    width: 213px;
+    border-top: 4px solid #ff0000;
+    background-color: #ff7f7f;
+}
+.systemmonitor-state:hover {
+    background-color: #FFFACD;
+}
+.systemmonitor-state p {
+    float:left;
+    margin: 5px;
+}
+.systemmonitor-device {
+    background-position: -6px 4px;
+    background-repeat: no-repeat;
+    min-height: 80px;
+}
+.systemmonitor-device.device-system { background-image: url("../icons/x64/network.png"); }
+.systemmonitor-device.device-server { 
+    background-image: url("../icons/x64/server.png");
+}
+.systemmonitor-device.device-ve {
+    background-image: url("../icons/x64/server.png");
+    width: 213px;
+    float: left;
+    border: 1px dashed #aaaaaa;
+    border-top: none;
+}
+
+.systemmonitor-content.icons32 {
+    padding:2px 10px 2px 56px;
+    background-repeat: no-repeat;
+    background-position: 12px 4px;
+}
+.systemmonitor-content.icons32.ico-no_state { /*background-image:url("../icons/x32/state_no.png"); */ }
+.systemmonitor-content.icons32.ico-unknown { background-image:url("../icons/x32/state_unknown.png"); }
+.systemmonitor-content.icons32.ico-ok { background-image:url("../icons/x32/state_ok.png"); }
+.systemmonitor-content.icons32.ico-info { background-image:url("../icons/x32/state_info.png"); }
+.systemmonitor-content.icons32.ico-warning { background-image:url("../icons/x32/state_warning.png"); }
+.systemmonitor-content.icons32.ico-critical { background-image:url("../icons/x32/state_critical.png"); }
+.systemmonitor-content.icons32.ico-error { background-image:url("../icons/x32/state_error.png"); }
+
+.systemmonitor-content table {
+    border: none;
+    margin-top: 10px;
+}
+
+.systemmonitor-content * .online {
+    border: 1px solid #ffffff;
+    background-color: #E3FFB8;
+    color: #000000;
+    padding:0px 5px;
+}
+.systemmonitor-content * .offline {
+    border: 1px solid #ffffff;
+    background-color: #d12f19; 
+    color:#ffffff;
+    padding:0px 5px;
+}
+
+/* Dashboard */
+.dashboard-modules {
+    float:left;
+    width:60px;
+    height: 60px;
+    border:1px dotted #888888;
+    background-color: #cccccc;
+    margin:10px;
+    background-position: center 5px;
+    background-repeat: no-repeat;
+    text-align: center;
+}
+
+.dashboard-modules a, .dashboard-modules a:hover{
+    color:Black;
+    display:block;
+    font-weight:bold;
+    height:30px;
+    padding-top:42px;
+    width:60px;
+    text-decoration: none;
+}
+
+.dashboard-modules.admin { background-image: url('../icons/x32/system.png') !important; }
+.dashboard-modules.vm { background-image: url('../icons/x32/drawer.png') !important; }
+.dashboard-modules.client { background-image: url('../icons/x32/client.png') !important; }
+.dashboard-modules.mail { background-image: url('../icons/x32/email.png') !important; }
+.dashboard-modules.monitor { background-image: url('../icons/x32/monitor.png') !important; }
+.dashboard-modules.dns { background-image: url('../icons/x32/dns.png') !important; }
+.dashboard-modules.tools { background-image: url('../icons/x32/tools.png') !important; }
+.dashboard-modules.help { background-image: url('../icons/x32/help.png') !important; }
+.dashboard-modules.domain { background-image: url('../icons/x32/domain.png') !important; }
+.dashboard-modules.sites { background-image: url('../icons/x32/sites.png') !important; }
+.dashboard-modules.billing { background-image: url('../icons/x32/calculator.png') !important; }
+
+.panel_dashboard h2 {
+    font-size:20px;
+}
+
+/* Image-Replacement */
+.swap { background-repeat:no-repeat; }
+.swap span { display:none; height:16px; } 
+#ir-HeaderLogo { background-image:url("../images/header_logo.png"); height:32px;margin:0 0 0.2em; } 
+#ir-Yes { background-image:url("../icons/x16/tick_circle.png"); height:16px; } 
+#ir-No { background-image:url("../icons/x16/cross_circle.png"); height:16px; } 
+
+/* BUTTONS */
+.buttons a, .buttons button{
+    display:block;
+    float:left;
+    margin:0 7px 0 0;
+    background-color:#f5f5f5;
+    border:1px solid #777777;
+    border-top: 1px solid #c8c8c8;
+    border-left:1px solid #c8c8c8;
+
+    font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+    font-size:90%;
+    line-height:130%;
+    text-decoration:none;
+    font-weight:bold;
+    color:#565656;
+    cursor:pointer;
+    padding:5px 10px 6px 7px; /* Links */
+}
+.buttons button{
+    width:auto;
+    overflow:visible;
+    padding:4px 10px 3px 7px; /* IE6 */
+}
+.buttons button[type]{
+    padding:5px 10px 5px 7px; /* Firefox */
+    line-height:17px; /* Safari */
+}
+*:first-child+html button[type]{
+    padding:4px 10px 3px 7px; /* IE7 */
+}
+.buttons button img, .buttons a img{
+    margin:0 3px -3px 0 !important;
+    padding:0;
+    border:none;
+    width:16px;
+    height:16px;
+}
+
+/* BUTTONS STANDARD */
+button:hover, .buttons a:hover{
+    background-color:#dff4ff;
+    border:1px solid #c2e1ef;
+    color:#336699;
+}
+.buttons a:active{
+    background-color:#6299c5;
+    border:1px solid #6299c5;
+    color:#fff;
+}
+
+/* BUTTONS POSITIVE */
+button.positive, .buttons a.positive{
+    color:#529214;
+}
+.buttons a.positive:hover, button.positive:hover{
+    background-color:#E6EFC2;
+    border:1px solid #C6D880;
+    color:#529214;
+}
+.buttons a.positive:active{
+    background-color:#529214;
+    border:1px solid #529214;
+    color:#fff;
+}
+
+/* BUTTONS NEGATIVE */
+.buttons a.negative, button.negative{
+    color:#d12f19;
+}
+.buttons a.negative:hover, button.negative:hover{
+    background-color:#fbe3e4;
+    border:1px solid #fbc2c4;
+    color:#d12f19;
+}
+.buttons a.negative:active{
+    background-color:#d12f19;
+    border:1px solid #d12f19;
+    color:#fff;
+}
+
+/* Button with icon and text */
+.iconstxt {
+    background-repeat: no-repeat; 
+    background-position: 4px center;
+}
+.iconstxt span { padding-left: 20px; }
+.iconstxt.icoPositive { background-image: url("../icons/x16/tick_circle_frame.png"); }
+.iconstxt.icoNegative { background-image: url("../icons/x16/cross_circle_frame.png"); }
+.iconstxt.icoAdd { background-image: url(../icons/x16/plus_circle_frame.png); }
+.iconstxt.icoKey { background-image: url("../icons/x16/key.png"); }
+.iconstxt.icoDelete { background-image: url("../icons/x16/minus_circle_frame.png"); }
+.iconstxt.icoDownload { background-image: url("../icons/x16/arrow_270.png"); }
+.iconstxt.icoRestore { background-image: url("../icons/x16/arrow_circle_225.png"); }
+
+/* Button with icon and without text */
+.icons16 span { display: none; }
+a.icons16 { height: 18px; width: 18px; padding: 0; background-repeat: no-repeat; background-position: 1px 1px;}
+button.icons16 { height: 20px; width: 20px; padding: 0; background-repeat: no-repeat; background-position: 1px 1px;}
+
+.icons16.icoDelete { background-image: url("../icons/x16/minus_circle_frame.png"); }
+.icons16.icoFilter { background-image: url(../icons/x16/funnel.png); }
+.icons16.icoEdit { background-image: url("../icons/x16/wrench.png"); }
+.icons16.icoDbAdmin { background-image: url("../icons/x16/database.png"); }
+.icons16.icoLoginAs { background-image: url("../icons/x16/user_go.png"); }
+.icons16.icoWebmailer { background-image: url("../icons/x16/mails_arrow.png"); }
+
+#ajaxloader {
+    text-align:center;
+    margin-top: 180px;
+}
+
+.blockLabel.email_at {
+    width: 20px !important;
+    margin: 1.6em 0.3em 0 0 !important
+}
+.textDisplay { display: block; }
+
+/* Form Length Classes */
+.textInput.formLengthBool { width: 25px !important; }
+.selectInput.formLengthBool { width: 60px !important; }
+.textInput.formLengthLimit { width: 50px !important; }
+.selectInput.formLengthLimit { width: 85px !important; }
+.formLengthDate { width: 75px !important; }
+.formLengthIPv4 { width: 125px !important; }
+.formLengthIPv6 { width: 100% !important; }
+.formLengthEmailUser { width: 30% !important; }
+.formLengthEmailDomain { width: 30% !important; }
+.formLengthHalf { width: 15% !important; }
+.formLengthDouble { width: 50% !important; }
+
+/* Individual Form Lengths */
+.textInput#username, .textInput#password, .textInput#passwort, .textInput#source_password { width: 100px; }
+.selectInput#language {	width: 75px; }
+.selectInput#client_group_id, .selectInput#default_group { width: 125px; }
+input#refresh, input#retry, input#expire, input#minimum, input#ttl { width: 50px !important; }
+
+/* --- */
+
+a[href $='#logout'] { padding-right: 18px; background: transparent url("../icons/x16/logout.png") no-repeat right top !important;	}
+
+/* Select Menu with Images */
+select.withicons option {
+    background-repeat:no-repeat;
+    background-position: 1px;
+    padding-left:24px;
+}	
+select.flags option {
+    background-image: url("../icons/flags_sprite.png");
+    background-repeat: no-repeat;
+    padding: 1px 0 1px 30px;
+}
+
+select.flags option[value=EL] {background-position:0 -1475px}
+select.flags option[value=AD], select.flags option[value=ad] {background-position:0 -1px}
+select.flags option[value=AE], select.flags option[value=ae] {background-position:0 -23px}
+select.flags option[value=AF], select.flags option[value=af] {background-position:0 -45px}
+select.flags option[value=AG], select.flags option[value=ag] {background-position:0 -67px}
+select.flags option[value=AI], select.flags option[value=ai] {background-position:0 -89px}
+select.flags option[value=AL], select.flags option[value=al] {background-position:0 -111px}
+select.flags option[value=AM], select.flags option[value=am] {background-position:0 -133px}
+select.flags option[value=AN], select.flags option[value=an] {background-position:0 -155px}
+select.flags option[value=AO], select.flags option[value=ao] {background-position:0 -177px}
+select.flags option[value=AQ], select.flags option[value=aq] {background-position:0 -199px}
+select.flags option[value=AR], select.flags option[value=ar] {background-position:0 -221px}
+select.flags option[value=AS], select.flags option[value=as] {background-position:0 -243px}
+select.flags option[value=AT], select.flags option[value=at] {background-position:0 -265px}
+select.flags option[value=AU], select.flags option[value=au] {background-position:0 -287px}
+select.flags option[value=AW], select.flags option[value=aw] {background-position:0 -309px}
+select.flags option[value=AX], select.flags option[value=ax] {background-position:0 -331px}
+select.flags option[value=AZ], select.flags option[value=az] {background-position:0 -353px}
+select.flags option[value=BA], select.flags option[value=ba] {background-position:0 -375px}
+select.flags option[value=BB], select.flags option[value=bb] {background-position:0 -397px}
+select.flags option[value=BD], select.flags option[value=bd] {background-position:0 -419px}
+select.flags option[value=BE], select.flags option[value=be] {background-position:0 -441px}
+select.flags option[value=BF], select.flags option[value=bf] {background-position:0 -463px}
+select.flags option[value=BG], select.flags option[value=bg] {background-position:0 -485px}
+select.flags option[value=BH], select.flags option[value=bh] {background-position:0 -507px}
+select.flags option[value=BI], select.flags option[value=bi] {background-position:0 -529px}
+select.flags option[value=BJ], select.flags option[value=bj] {background-position:0 -551px}
+select.flags option[value=BM], select.flags option[value=bm] {background-position:0 -573px}
+select.flags option[value=BN], select.flags option[value=bn] {background-position:0 -595px}
+select.flags option[value=BO], select.flags option[value=bo] {background-position:0 -617px}
+select.flags option[value=BR], select.flags option[value=br] {background-position:0 -639px}
+select.flags option[value=BS], select.flags option[value=bs] {background-position:0 -661px}
+select.flags option[value=BT], select.flags option[value=bt] {background-position:0 -683px}
+select.flags option[value=BV], select.flags option[value=bv] {background-position:0 -705px}
+select.flags option[value=BW], select.flags option[value=bw] {background-position:0 -727px}
+select.flags option[value=BY], select.flags option[value=by] {background-position:0 -749px}
+select.flags option[value=BZ], select.flags option[value=bz] {background-position:0 -771px}
+select.flags option[value=CA], select.flags option[value=ca] {background-position:0 -793px}
+select.flags option[value=CC], select.flags option[value=cc] {background-position:0 -837px}
+select.flags option[value=CD], select.flags option[value=cd] {background-position:0 -859px}
+select.flags option[value=CF], select.flags option[value=cf] {background-position:0 -881px}
+select.flags option[value=CG], select.flags option[value=cg] {background-position:0 -903px}
+select.flags option[value=CH], select.flags option[value=ch] {background-position:0 -925px}
+select.flags option[value=CI], select.flags option[value=ci] {background-position:0 -947px}
+select.flags option[value=CK], select.flags option[value=ck] {background-position:0 -969px}
+select.flags option[value=CL], select.flags option[value=cl] {background-position:0 -991px}
+select.flags option[value=CM], select.flags option[value=cm] {background-position:0 -1013px}
+select.flags option[value=CN], select.flags option[value=cn] {background-position:0 -1035px}
+select.flags option[value=CO], select.flags option[value=co] {background-position:0 -1057px}
+select.flags option[value=CR], select.flags option[value=cr] {background-position:0 -1079px}
+select.flags option[value=CS], select.flags option[value=cs] {background-position:0 -1101px}
+select.flags option[value=CU], select.flags option[value=cu] {background-position:0 -1123px}
+select.flags option[value=CV], select.flags option[value=cv] {background-position:0 -1145px}
+select.flags option[value=CX], select.flags option[value=cx] {background-position:0 -1167px}
+select.flags option[value=CY], select.flags option[value=cy] {background-position:0 -1189px}
+select.flags option[value=CZ], select.flags option[value=cz] {background-position:0 -1211px}
+select.flags option[value=DE], select.flags option[value=de] {background-position:0 -1233px}
+select.flags option[value=DJ], select.flags option[value=dj] {background-position:0 -1255px}
+select.flags option[value=DK], select.flags option[value=dk] {background-position:0 -1277px}
+select.flags option[value=DM], select.flags option[value=dm] {background-position:0 -1299px}
+select.flags option[value=DO], select.flags option[value=do] {background-position:0 -1321px}
+select.flags option[value=DZ], select.flags option[value=dz] {background-position:0 -1343px}
+select.flags option[value=EC], select.flags option[value=ec] {background-position:0 -1365px}
+select.flags option[value=EE], select.flags option[value=ee] {background-position:0 -1387px}
+select.flags option[value=EG], select.flags option[value=eg] {background-position:0 -1409px}
+select.flags option[value=EH], select.flags option[value=eh] {background-position:0 -1431px}
+select.flags option[value=ER], select.flags option[value=er] {background-position:0 -1497px}
+select.flags option[value=ES], select.flags option[value=ET], select.flags option[value=es], select.flags option[value=et] {background-position:0 -1519px}
+select.flags option[value=FI], select.flags option[value=fi] {background-position:0 -1585px}
+select.flags option[value=FJ], select.flags option[value=fj] {background-position:0 -1607px}
+select.flags option[value=FK], select.flags option[value=fk] {background-position:0 -1629px}
+select.flags option[value=FM], select.flags option[value=fm] {background-position:0 -1651px}
+select.flags option[value=FO], select.flags option[value=fo] {background-position:0 -1673px}
+select.flags option[value=FR], select.flags option[value=fr] {background-position:0 -1695px}
+select.flags option[value=GA], select.flags option[value=ga] {background-position:0 -1717px}
+select.flags option[value=GB], select.flags option[value=en], select.flags option[value=gb] {background-position:0 -1739px}
+select.flags option[value=GD], select.flags option[value=gd] {background-position:0 -1761px}
+select.flags option[value=GE], select.flags option[value=ge] {background-position:0 -1783px}
+select.flags option[value=GF], select.flags option[value=gf] {background-position:0 -1805px}
+select.flags option[value=GH], select.flags option[value=gh] {background-position:0 -1827px}
+select.flags option[value=GI], select.flags option[value=gi] {background-position:0 -1849px}
+select.flags option[value=GL], select.flags option[value=gl] {background-position:0 -1871px}
+select.flags option[value=GM], select.flags option[value=gm] {background-position:0 -1893px}
+select.flags option[value=GN], select.flags option[value=gn] {background-position:0 -1915px}
+select.flags option[value=GP], select.flags option[value=gp] {background-position:0 -1937px}
+select.flags option[value=GQ], select.flags option[value=gq] {background-position:0 -1959px}
+select.flags option[value=GR], select.flags option[value=el], select.flags option[value=gr] {background-position:0 -1981px}
+select.flags option[value=GS], select.flags option[value=gs] {background-position:0 -2003px}
+select.flags option[value=GT], select.flags option[value=gt] {background-position:0 -2025px}
+select.flags option[value=GU], select.flags option[value=gu] {background-position:0 -2047px}
+select.flags option[value=GW], select.flags option[value=gw] {background-position:0 -2069px}
+select.flags option[value=GY], select.flags option[value=gy] {background-position:0 -2091px}
+select.flags option[value=HK], select.flags option[value=hk] {background-position:0 -2113px}
+select.flags option[value=HM], select.flags option[value=hm] {background-position:0 -2135px}
+select.flags option[value=HN], select.flags option[value=hn] {background-position:0 -2157px}
+select.flags option[value=HR], select.flags option[value=hr] {background-position:0 -2179px}
+select.flags option[value=HT], select.flags option[value=ht] {background-position:0 -2201px}
+select.flags option[value=HU], select.flags option[value=hu] {background-position:0 -2223px}
+select.flags option[value=ID], select.flags option[value=id] {background-position:0 -2245px}
+select.flags option[value=IE], select.flags option[value=ie] {background-position:0 -2267px}
+select.flags option[value=IL], select.flags option[value=il] {background-position:0 -2289px}
+select.flags option[value=IN], select.flags option[value=in] {background-position:0 -2311px}
+select.flags option[value=IO], select.flags option[value=io] {background-position:0 -2333px}
+select.flags option[value=IQ], select.flags option[value=iq] {background-position:0 -2355px}
+select.flags option[value=IR], select.flags option[value=ir] {background-position:0 -2377px}
+select.flags option[value=IS], select.flags option[value=is] {background-position:0 -2399px}
+select.flags option[value=IT], select.flags option[value=it] {background-position:0 -2421px}
+select.flags option[value=JM], select.flags option[value=jm] {background-position:0 -2443px}
+select.flags option[value=JO], select.flags option[value=jo] {background-position:0 -2465px}
+select.flags option[value=JP], select.flags option[value=ja], select.flags option[value=jp] {background-position:0 -2487px}
+select.flags option[value=KE], select.flags option[value=ke] {background-position:0 -2509px}
+select.flags option[value=KG], select.flags option[value=kg] {background-position:0 -2531px}
+select.flags option[value=KH], select.flags option[value=kh] {background-position:0 -2553px}
+select.flags option[value=KI], select.flags option[value=ki] {background-position:0 -2575px}
+select.flags option[value=KM], select.flags option[value=km] {background-position:0 -2597px}
+select.flags option[value=KN], select.flags option[value=kn] {background-position:0 -2619px}
+select.flags option[value=KP], select.flags option[value=kp] {background-position:0 -2641px}
+select.flags option[value=KR], select.flags option[value=kr] {background-position:0 -2663px}
+select.flags option[value=KW], select.flags option[value=kw] {background-position:0 -2685px}
+select.flags option[value=KY], select.flags option[value=ky] {background-position:0 -2707px}
+select.flags option[value=KZ], select.flags option[value=kz] {background-position:0 -2729px}
+select.flags option[value=LA], select.flags option[value=la] {background-position:0 -2751px}
+select.flags option[value=LB], select.flags option[value=lb] {background-position:0 -2773px}
+select.flags option[value=LC], select.flags option[value=lc] {background-position:0 -2795px}
+select.flags option[value=LI], select.flags option[value=li] {background-position:0 -2817px}
+select.flags option[value=LK], select.flags option[value=lk] {background-position:0 -2839px}
+select.flags option[value=LR], select.flags option[value=lr] {background-position:0 -2861px}
+select.flags option[value=LS], select.flags option[value=ls] {background-position:0 -2883px}
+select.flags option[value=LT], select.flags option[value=lt] {background-position:0 -2905px}
+select.flags option[value=LU], select.flags option[value=lu] {background-position:0 -2927px}
+select.flags option[value=LV], select.flags option[value=lv] {background-position:0 -2949px}
+select.flags option[value=LY], select.flags option[value=ly] {background-position:0 -2971px}
+select.flags option[value=MA], select.flags option[value=ma] {background-position:0 -2993px}
+select.flags option[value=MC], select.flags option[value=mc] {background-position:0 -3015px}
+select.flags option[value=MD], select.flags option[value=md] {background-position:0 -3037px}
+select.flags option[value=ME], select.flags option[value=me] {background-position:0 -3059px}
+select.flags option[value=MG], select.flags option[value=mg] {background-position:0 -3081px}
+select.flags option[value=MH], select.flags option[value=mh] {background-position:0 -3103px}
+select.flags option[value=MK], select.flags option[value=mk] {background-position:0 -3125px}
+select.flags option[value=ML], select.flags option[value=ml] {background-position:0 -3147px}
+select.flags option[value=MM], select.flags option[value=mm] {background-position:0 -3169px}
+select.flags option[value=MN], select.flags option[value=mn] {background-position:0 -3191px}
+select.flags option[value=MO], select.flags option[value=mo] {background-position:0 -3213px}
+select.flags option[value=MP], select.flags option[value=mp] {background-position:0 -3235px}
+select.flags option[value=MQ], select.flags option[value=mq] {background-position:0 -3257px}
+select.flags option[value=MR], select.flags option[value=mr] {background-position:0 -3279px}
+select.flags option[value=MS], select.flags option[value=ms] {background-position:0 -3301px}
+select.flags option[value=MT], select.flags option[value=mt] {background-position:0 -3323px}
+select.flags option[value=MU], select.flags option[value=mu] {background-position:0 -3345px}
+select.flags option[value=MV], select.flags option[value=mv] {background-position:0 -3367px}
+select.flags option[value=MW], select.flags option[value=mw] {background-position:0 -3389px}
+select.flags option[value=MX], select.flags option[value=mx] {background-position:0 -3411px}
+select.flags option[value=MY], select.flags option[value=my] {background-position:0 -3433px}
+select.flags option[value=MZ], select.flags option[value=mz] {background-position:0 -3455px}
+select.flags option[value=NA], select.flags option[value=na] {background-position:0 -3477px}
+select.flags option[value=NC], select.flags option[value=nc] {background-position:0 -3499px}
+select.flags option[value=NE], select.flags option[value=ne] {background-position:0 -3521px}
+select.flags option[value=NF], select.flags option[value=nf] {background-position:0 -3543px}
+select.flags option[value=NG], select.flags option[value=ng] {background-position:0 -3565px}
+select.flags option[value=NI], select.flags option[value=ni] {background-position:0 -3587px}
+select.flags option[value=NL], select.flags option[value=nl] {background-position:0 -3609px}
+select.flags option[value=NO], select.flags option[value=no] {background-position:0 -3631px}
+select.flags option[value=NP], select.flags option[value=np] {background-position:0 -3653px}
+select.flags option[value=NR], select.flags option[value=nr] {background-position:0 -3675px}
+select.flags option[value=NU], select.flags option[value=nu] {background-position:0 -3697px}
+select.flags option[value=NZ], select.flags option[value=nz] {background-position:0 -3719px}
+select.flags option[value=OM], select.flags option[value=om] {background-position:0 -3741px}
+select.flags option[value=PA], select.flags option[value=pa] {background-position:0 -3763px}
+select.flags option[value=PE], select.flags option[value=pe] {background-position:0 -3785px}
+select.flags option[value=PF], select.flags option[value=pf] {background-position:0 -3807px}
+select.flags option[value=PG], select.flags option[value=pg] {background-position:0 -3829px}
+select.flags option[value=PH], select.flags option[value=ph] {background-position:0 -3851px}
+select.flags option[value=PK], select.flags option[value=pk] {background-position:0 -3873px}
+select.flags option[value=PL], select.flags option[value=pl] {background-position:0 -3895px}
+select.flags option[value=PM], select.flags option[value=pm] {background-position:0 -3917px}
+select.flags option[value=PN], select.flags option[value=pn] {background-position:0 -3939px}
+select.flags option[value=PR], select.flags option[value=pr] {background-position:0 -3961px}
+select.flags option[value=PS], select.flags option[value=ps] {background-position:0 -3983px}
+select.flags option[value=PT], select.flags option[value=pt] {background-position:0 -4005px}
+select.flags option[value=PW], select.flags option[value=pw] {background-position:0 -4027px}
+select.flags option[value=PY], select.flags option[value=py] {background-position:0 -4049px}
+select.flags option[value=QA], select.flags option[value=qa] {background-position:0 -4071px}
+select.flags option[value=RE], select.flags option[value=re] {background-position:0 -4093px}
+select.flags option[value=RO], select.flags option[value=ro] {background-position:0 -4115px}
+select.flags option[value=RS], select.flags option[value=rs] {background-position:0 -4137px}
+select.flags option[value=RU], select.flags option[value=ru] {background-position:0 -4159px}
+select.flags option[value=RW], select.flags option[value=rw] {background-position:0 -4181px}
+select.flags option[value=SA], select.flags option[value=sa] {background-position:0 -4203px}
+select.flags option[value=SB], select.flags option[value=sb] {background-position:0 -4225px}
+select.flags option[value=SC], select.flags option[value=sc] {background-position:0 -4247px}
+select.flags option[value=SD], select.flags option[value=sd] {background-position:0 -4291px}
+select.flags option[value=SE], select.flags option[value=se] {background-position:0 -4313px}
+select.flags option[value=SG], select.flags option[value=sg] {background-position:0 -4335px}
+select.flags option[value=SH], select.flags option[value=sh] {background-position:0 -4357px}
+select.flags option[value=SI], select.flags option[value=si] {background-position:0 -4379px}
+select.flags option[value=SJ], select.flags option[value=sj] {background-position:0 -4401px}
+select.flags option[value=SK], select.flags option[value=sk] {background-position:0 -4423px}
+select.flags option[value=SL], select.flags option[value=sl] {background-position:0 -4445px}
+select.flags option[value=SM], select.flags option[value=sm] {background-position:0 -4467px}
+select.flags option[value=SN], select.flags option[value=sn] {background-position:0 -4489px}
+select.flags option[value=SO], select.flags option[value=so] {background-position:0 -4511px}
+select.flags option[value=SR], select.flags option[value=sr] {background-position:0 -4533px}
+select.flags option[value=ST], select.flags option[value=st] {background-position:0 -4555px}
+select.flags option[value=SV], select.flags option[value=sv] {background-position:0 -4577px}
+select.flags option[value=SY], select.flags option[value=sy] {background-position:0 -4599px}
+select.flags option[value=SZ], select.flags option[value=sz] {background-position:0 -4621px}
+select.flags option[value=TC], select.flags option[value=tc] {background-position:0 -4643px}
+select.flags option[value=TD], select.flags option[value=td] {background-position:0 -4665px}
+select.flags option[value=TF], select.flags option[value=tf] {background-position:0 -4687px}
+select.flags option[value=TG], select.flags option[value=tg] {background-position:0 -4709px}
+select.flags option[value=TH], select.flags option[value=th] {background-position:0 -4731px}
+select.flags option[value=TJ], select.flags option[value=tj] {background-position:0 -4753px}
+select.flags option[value=TK], select.flags option[value=tk] {background-position:0 -4775px}
+select.flags option[value=TL], select.flags option[value=tl] {background-position:0 -4797px}
+select.flags option[value=TM], select.flags option[value=tm] {background-position:0 -4819px}
+select.flags option[value=TN], select.flags option[value=tn] {background-position:0 -4841px}
+select.flags option[value=TO], select.flags option[value=to] {background-position:0 -4863px}
+select.flags option[value=TR], select.flags option[value=tr] {background-position:0 -4885px}
+select.flags option[value=TT], select.flags option[value=tt] {background-position:0 -4907px}
+select.flags option[value=TV], select.flags option[value=tv] {background-position:0 -4929px}
+select.flags option[value=TW], select.flags option[value=tw] {background-position:0 -4951px}
+select.flags option[value=TZ], select.flags option[value=tz] {background-position:0 -4973px}
+select.flags option[value=UA], select.flags option[value=ua] {background-position:0 -4995px}
+select.flags option[value=UG], select.flags option[value=ug] {background-position:0 -5017px}
+select.flags option[value=UM], select.flags option[value=um] {background-position:0 -5039px}
+select.flags option[value=US], select.flags option[value=us] {background-position:0 -5061px}
+select.flags option[value=UY], select.flags option[value=uy] {background-position:0 -5083px}
+select.flags option[value=UZ], select.flags option[value=uz] {background-position:0 -5105px}
+select.flags option[value=VA], select.flags option[value=va] {background-position:0 -5127px}
+select.flags option[value=VC], select.flags option[value=vc] {background-position:0 -5149px}
+select.flags option[value=VE], select.flags option[value=ve] {background-position:0 -5171px}
+select.flags option[value=VG], select.flags option[value=vg] {background-position:0 -5193px}
+select.flags option[value=VI], select.flags option[value=vi] {background-position:0 -5215px}
+select.flags option[value=VN], select.flags option[value=vn] {background-position:0 -5237px}
+select.flags option[value=VU], select.flags option[value=vu] {background-position:0 -5259px}
+select.flags option[value=WF], select.flags option[value=wf] {background-position:0 -5303px}
+select.flags option[value=WS], select.flags option[value=ws] {background-position:0 -5325px}
+select.flags option[value=YE], select.flags option[value=ye] {background-position:0 -5347px}
+select.flags option[value=YT], select.flags option[value=yt] {background-position:0 -5369px}
+select.flags option[value=ZA], select.flags option[value=za] {background-position:0 -5391px}
+select.flags option[value=ZM], select.flags option[value=zm] {background-position:0 -5413px}
+select.flags option[value=ZW], select.flags option[value=zw] {background-position:0 -5435px}
+
+.panel_login {
+    max-width: 80%;
+    min-width: 680px;
+}
+
+div.subsectiontoggle {
+    border:1px solid #ccc;
+    font-weight:bold;
+    font-size:14px;
+    padding-top:10px;
+    padding-bottom:0;
+    margin-top:5px;
+    text-indent:15px;
+    cursor:pointer;
+    margin-bottom:10px;
+    background-color:#f4f4f4;
+    -moz-border-radius:5px;
+    -webkit-border-radius:5px;
+    -khtml-border-radius:5px;
+    -o-border-radius:5px;
+    -ms-border-radius:5px;
+    border-radius:5px;
+}
+div.subsectiontoggle span{
+    display:inline-block;
+    margin-bottom:-3px;
+    margin-right:10px;
+    width:16px;
+    height:16px;
+    background:url(../icons/x16/plus_circle_frame.png) top left no-repeat;
+}
+div.subsectiontoggle span.showing{
+    background:url(../icons/x16/minus_circle_frame.png) top left no-repeat;
+}
+div.subsectiontoggle em{
+    display:block;
+    position:relative;
+    left:425px;
+    top:-13px;
+    margin-bottom:-3px;
+    width:13px;
+    height:13px;
+    background:url(../images/chevron.png) top left no-repeat;
+    -webkit-transform:none;
+    -moz-transform:none;
+    -khtml-transform:none;
+    -o-transform:none;
+    -ms-transform:none;
+    transform:none;
+    -webkit-transition-duration: .2s;
+    -moz-transition-duration: .2s;
+    -khtml-transition-duration: .2s;
+    -o-transition-duration: .2s;
+    -ms-transition-duration: .2s;
+    transition-duration: .2s;
+    -webkit-transition-property: -webkit-transform;
+    -moz-transition-property: -moz-transform;
+    -khtml-transition-property: -khtml-transform;
+    -o-transition-property: -o-transform;
+    -ms-transition-property: -ms-transform;
+    transition-property: transform;
+}
+div.subsectiontoggle em.showing{
+    display:block;
+    position:relative;
+    left:425px;
+    top:-13px;
+    background:url(../images/chevron.png) top left no-repeat;
+    width:13px;
+    height:13px;
+    -webkit-transform:rotate(90deg);
+    -moz-transform:rotate(90deg);
+    -khtml-transform:rotate(90deg);
+    -o-transform:rotate(90deg);
+    -ms-transform:rotate(90deg);
+    transform:rotate(90deg);
+}
+div.subsectiontoggle:hover em{
+    -webkit-transform:rotate(90deg);
+    -moz-transform:rotate(90deg);
+    -khtml-transform:rotate(90deg);
+    -o-transform:rotate(90deg);
+    -ms-transform:rotate(90deg);
+    transform:rotate(90deg);
+}
+
+div.gs-container{
+    margin-top:10px;
+}
+div.gs-container *{
+    margin: 0;
+    padding: 0;
+    background-position: 0 0;
+    text-decoration: none;
+    font-size: 1em;
+}
+div.gs-container input{
+    background: url("../icons/x16/magnifier_left.png") no-repeat 4px 3px #FFFFFF;
+    height:20px;
+    border:1px solid #444;
+    padding:0 22px 2px;
+    color:#444;
+    -moz-border-radius:5px;
+    -webkit-border-radius:5px;
+    -khtml-border-radius:5px;
+    -o-border-radius:5px;
+    -ms-border-radius:5px;
+    border-radius:5px;
+}
+input.gs-loading{
+    background-image: url(../icons/x16/loading.gif);
+    background-repeat: no-repeat;
+    background-position: center right;
+}
+ul.gs-resultbox{
+    margin: 0 !important;
+    padding: 0 !important;
+    width: 300px;
+    z-index: 999999;
+    border: 1px solid #777;
+    font-size: 11px;
+    background: #fff;
+    -moz-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -webkit-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -khtml-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -o-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -ms-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    box-shadow: 2px 2px 5px 0 #c5c5c5;
+    list-style: none;
+    -moz-border-radius:5px;
+    -webkit-border-radius:5px;
+    -khtml-border-radius:5px;
+    -o-border-radius:5px;
+    -ms-border-radius:5px;
+    border-radius:5px;
+}
+ul.gs-resultbox li{
+    float: left;
+    width: 100%;
+    clear: both;
+    cursor: pointer;
+}
+ul.gs-resultbox li.gs-cheader{
+    height: 13px;
+    overflow: hidden;
+    padding: 5px 0;
+    color: #fff;
+    background: #6ea6d1;
+    cursor:default;
+    padding-bottom:10px;
+}
+ul.gs-resultbox li.gs-cheader p.gs-cheader-title{
+    margin: 0 !important;
+    padding: 0 0 0 10px !important;
+    float: left;
+    font-size: 12px;
+    font-weight: bold;
+}
+ul.gs-resultbox li.gs-cheader p.gs-cheader-limit{
+    margin: 0 !important;
+    padding: 0 10px 0 0 !important;
+    float: right;
+    font-size: 11px;
+    font-weight: normal;
+}
+ul.gs-resultbox li.gs-cdata{
+    margin: 0 !important;
+    padding: 0 !important;
+    border-bottom: 1px solid #c5c5c5;
+}
+ul.gs-resultbox li.gs-cdata:last-child{
+    border-bottom: none;
+}
+ul.gs-resultbox li.gs-cdata:hover{
+    background: #eaf4fd;
+}
+ul.gs-resultbox li.gs-cdata a{
+    display: block;
+    padding: 5px 10px;
+    text-decoration: none !important;
+    background: #fff;
+}
+ul.gs-resultbox li.gs-cdata a:hover{
+    background: #cde0ff;
+}
+ul.gs-resultbox li.gs-cdata img{
+    margin-right: 12px;
+}
+ul.gs-resultbox li.gs-cdata p{
+    margin: 0 !important;
+    padding: 0 !important;
+    color: #444;
+    font-size: 10px;
+    min-height:30px;
+}
+ul.gs-resultbox li.gs-cdata p span.gs-cdata-title{
+    display: inline !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    font-size: 11px;
+    font-weight: bold;
+    color: #000;
+}
+ul.gs-resultbox li:first-child{
+    -moz-border-radius:5px 5px 0 0;
+    -webkit-border-radius:5px 5px 0 0;
+    -khtml-border-radius:5px 5px 0 0;
+    -o-border-radius:5px 5px 0 0;
+    -ms-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
+}
+ul.gs-resultbox li:last-child{
+    -moz-border-radius:0 0 5px 5px;
+    -webkit-border-radius:0 0 5px 5px;
+    -khtml-border-radius:0 0 5px 5px;
+    -o-border-radius:0 0 5px 5px;
+    -ms-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
+}
+
+div.df-container{
+}
+div.df-container *{
+    margin: 0;
+    padding: 0;
+    background-position: 0 0;
+    text-decoration: none;
+    font-size: 1em;
+}
+div.df-container input{
+}
+input.df-loading{
+    background-image: url(../icons/x16/loading.gif);
+    background-repeat: no-repeat;
+    background-position: center right;
+}
+ul.df-resultbox{
+    margin: 0 !important;
+    padding: 0 !important;
+    min-width: 250px;
+    max-width: 500px;
+    z-index: 999999;
+    border: 1px solid #777;
+    font-size: 11px;
+    background: #fff;
+    -moz-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -webkit-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -khtml-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -o-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    -ms-box-shadow: 2px 2px 5px 0 #c5c5c5;
+    box-shadow: 2px 2px 5px 0 #c5c5c5;
+    list-style: none;
+    -moz-border-radius:5px;
+    -webkit-border-radius:5px;
+    -khtml-border-radius:5px;
+    -o-border-radius:5px;
+    -ms-border-radius:5px;
+    border-radius:5px;
+}
+ul.df-resultbox li{
+    float: left;
+    width: 100%;
+    clear: both;
+    cursor: pointer;
+}
+ul.df-resultbox li.df-cheader{
+    height: 13px;
+    overflow: hidden;
+    padding: 5px 0;
+    color: #fff;
+    background: #6ea6d1;
+    cursor:default;
+    padding-bottom:10px;
+}
+ul.df-resultbox li.df-cheader p.df-cheader-title{
+    margin: 0 !important;
+    padding: 0 0 0 10px !important;
+    float: left;
+    font-size: 12px;
+    font-weight: bold;
+}
+ul.df-resultbox li.df-cheader p.df-cheader-limit{
+    margin: 0 !important;
+    padding: 0 10px 0 0 !important;
+    float: right;
+    font-size: 11px;
+    font-weight: normal;
+}
+ul.df-resultbox li.df-cdata{
+    margin: 0 !important;
+    padding: 0 !important;
+    border-bottom: 1px solid #c5c5c5;
+}
+ul.df-resultbox li.df-cdata:last-child{
+    border-bottom: none;
+}
+ul.df-resultbox li.df-cdata:hover{
+    background: #eaf4fd;
+}
+ul.df-resultbox li.df-cdata a{
+    display: block;
+    padding: 5px 10px;
+    text-decoration: none !important;
+    background: #fff;
+}
+ul.df-resultbox li.df-cdata a:hover{
+    background: #cde0ff;
+}
+ul.df-resultbox li.df-cdata img{
+    margin-right: 12px;
+}
+ul.df-resultbox li.df-cdata p{
+    margin: 0 !important;
+    padding: 0 !important;
+    color: #444;
+    font-size: 10px;
+    min-height:30px;
+}
+ul.df-resultbox li.df-cdata p span.df-cdata-title{
+    display: inline !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    font-size: 11px;
+    font-weight: bold;
+    color: #000;
+}
+ul.df-resultbox li:first-child{
+    -moz-border-radius:5px 5px 0 0;
+    -webkit-border-radius:5px 5px 0 0;
+    -khtml-border-radius:5px 5px 0 0;
+    -o-border-radius:5px 5px 0 0;
+    -ms-border-radius:5px 5px 0 0;
+    border-radius:5px 5px 0 0;
+}
+ul.df-resultbox li:last-child{
+    -moz-border-radius:0 0 5px 5px;
+    -webkit-border-radius:0 0 5px 5px;
+    -khtml-border-radius:0 0 5px 5px;
+    -o-border-radius:0 0 5px 5px;
+    -ms-border-radius:0 0 5px 5px;
+    border-radius:0 0 5px 5px;
+}
+
+span.icons16-empty{
+    float:left;
+    display:block;
+    height:20px;
+    width:20px;
+    margin:0 7px 0 0;
+}
+
+.ttip{
+    width:16px;
+    height:16px;
+    cursor:pointer;
+    background: url(../icons/x16/question_frame.png) no-repeat center center;
+    float:right;
+    display:inline;
+    position:relative;
+    right:-2px;
+    top:-2px;
+}
+
+p.prefix {
+    float: left;
+    margin: 0;
+    text-align: right;
+}
+p.label {
+    float: left;
+    margin: 5px 15px 0 0;
+}
+p.value {
+    float:left;
+    margin: 0 0 0 2px;
+}
+
+/* content_ispc
+-------------------------------------------------------------- */
+.tipsy { font-size: 10px; position: absolute; padding: 5px; z-index: 100000; }
+.tipsy-inner { background-color: #000; color: #FFF; max-width: 350px; padding: 5px 8px 4px 8px; text-align: left; }
+
+/* Rounded corners */
+.tipsy-inner { border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
+
+/* Uncomment for shadow */
+/*.tipsy-inner { box-shadow: 0 0 5px #000000; -webkit-box-shadow: 0 0 5px #000000; -moz-box-shadow: 0 0 5px #000000; }*/
+
+.tipsy-arrow { position: absolute; width: 0; height: 0; line-height: 0; border: 5px dashed #000; }
+
+/* Rules to colour arrows */
+.tipsy-arrow-n { border-bottom-color: #000; }
+.tipsy-arrow-s { border-top-color: #000; }
+.tipsy-arrow-e { border-left-color: #000; }
+.tipsy-arrow-w { border-right-color: #000; }
+
+.tipsy-n .tipsy-arrow { top: 0px; left: 50%; margin-left: -5px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent; }
+.tipsy-nw .tipsy-arrow { top: 0; left: 10px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent;}
+.tipsy-ne .tipsy-arrow { top: 0; right: 10px; border-bottom-style: solid; border-top: none;  border-left-color: transparent; border-right-color: transparent;}
+.tipsy-s .tipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; border-top-style: solid; border-bottom: none;  border-left-color: transparent; border-right-color: transparent; }
+.tipsy-sw .tipsy-arrow { bottom: 0; left: 10px; border-top-style: solid; border-bottom: none;  border-left-color: transparent; border-right-color: transparent; }
+.tipsy-se .tipsy-arrow { bottom: 0; right: 10px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; }
+.tipsy-e .tipsy-arrow { right: 0; top: 50%; margin-top: -5px; border-left-style: solid; border-right: none; border-top-color: transparent; border-bottom-color: transparent; }
+.tipsy-w .tipsy-arrow { left: 0; top: 50%; margin-top: -5px; border-right-style: solid; border-left: none; border-top-color: transparent; border-bottom-color: transparent; }
+
+/* uni-form-generic
+-------------------------------------------------------------- */
+
+/* Uni-Form by Dragan Babic [Superawesome Industries]  - http: //sprawsm.com/uni-form/ */ 
+/* Some rights reserved - http: //creativecommons.org/licenses/by-sa/2.5/ */
+/* Do not edit this file directly, make your changes to uni-form.css in the same folder */
+
+/* ------------------------------------------------------------------------------ */
+
+.uniForm{ margin: 0; padding: 0; position: relative; z-index: 1; } /* reset stuff */
+
+/* Some generals and more resets */
+.uniForm fieldset{ border: none; margin: 0; padding: 0; }
+.uniForm fieldset legend{ margin: 0; padding: 0; }
+
+/* This is the main unit that contains our form elements */
+.uniForm .ctrlHolder,
+.uniForm .buttonHolder{ margin: 0; padding: 0; clear: both; }
+
+/* Clear all floats */ 
+.uniForm:after,
+.uniForm .buttonHolder:after, 
+.uniForm .ctrlHolder:after, 
+.uniForm .ctrlHolder .multiField:after,
+.uniForm .inlineLabel:after{ content: "."; display: block; height: 0; line-height: 0; font-size: 0; clear: both; min-height: 0; visibility: hidden; }
+
+/* A class to be used on a label that contains a checkbox or a radio button */
+.uniForm .inlineLabel,
+.uniForm .inlineLabels .inlineLabel,
+.uniForm .blockLabels .inlineLabel{ width: auto; float: none; margin: 0; display: block; }
+/* IE shows borders & padding on checkboxes and radio buttons if they are declared on an input element, remove them */
+/* Legacy/Inheritance fix */
+.uniForm .inlineLabel input,
+.uniForm .inlineLabels .inlineLabel input,
+.uniForm .blockLabels .inlineLabel input{ border: none; padding: 0; margin: 0; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* Styles for form controls where labels are above the input elements */
+/* Set the class of the parent (preferably to a fieldset) to .blockLabels */
+
+.uniForm label,
+.uniForm .label,
+.uniForm .blockLabels label,
+.uniForm .blockLabels .label{ display: block; float: none; padding: 0; line-height: 100%; width: auto; }
+
+/* Float the input elements */
+.uniForm .textInput,
+.uniForm .blockLabels .textInput,
+.uniForm .blockLabels .fileUpload,
+.uniForm .selectInput,
+.uniForm .blockLabels .selectInput,
+.uniForm .blockLabels select,
+.uniForm textarea,
+.uniForm .blockLabels textarea{ float: left; }
+
+/* Postition the hints */
+.uniForm .formHint,
+.uniForm .blockLabels .formHint{ float: right; margin: 0; clear: none; }
+
+/* Position the elements inside combo boxes (multiple selects/checkboxes/radio buttons per unit) */
+.uniForm .multiField,
+.uniForm .blockLabels .multiField{ width: auto; float: left; }
+.uniForm .multiField .inlineLabel,
+.uniForm .blockLabels .multiField .inlineLabel{ display: block; margin: 0 0 .5em 0; }
+.uniForm .multiField .blockLabel,
+.uniForm .blockLabels .multiField .blockLabel{ float: left; width: auto; margin: 0; }
+.uniForm .multiField .blockLabel .textInput,
+.uniForm .multiField .blockLabel .selectInput,
+.uniForm .multiField .blockLabel select,
+.uniForm .blockLabels .multiField .blockLabel .textInput,
+.uniForm .blockLabels .multiField .blockLabel .selectInput,
+.uniForm .blockLabels .multiField .blockLabel select{ width: 100%; margin: 0; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* Styles for form controls where labels are in line with the input elements */
+/* Set the class of the parent (preferably to a fieldset) to .inlineLabels */
+.uniForm .inlineLabels label,
+.uniForm .inlineLabels .label{ float: left; margin: 0; padding: 0; line-height: 100%; position: relative; }
+
+/* Float the input elements */
+.uniForm .inlineLabels .textInput,
+.uniForm .inlineLabels .fileUpload,        
+.uniForm .inlineLabels .selectInput,
+.uniForm .inlineLabels select,
+.uniForm .inlineLabels textarea{ float: left; }
+
+/* Postition the hints */
+.uniForm .inlineLabels .formHint{ clear: both; float: none; }
+.uniForm .inlineLabels .multiField{ float: left; }
+.uniForm .inlineLabels .multiField .inlineLabel{}
+.uniForm .inlineLabels .multiField .blockLabel{}
+.uniForm .inlineLabels .multiField .blockLabel .textInput,
+.uniForm .inlineLabels .multiField .blockLabel .selectInput,
+.uniForm .inlineLabels .multiField .blockLabel select{ display: block; width: 100%; float: none; }
+.uniForm .inlineLabels .multiField select{ float: left; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* Required fields asterisk styling for .blockLabels */
+.uniForm label em,
+.uniForm .label em,
+.uniForm .blockLabels label em,
+.uniForm .blockLabels .label em{ position: absolute; left: -7px; }
+
+/* Required fields asterisk styling for .inlineLabels */
+.uniForm .inlineLabels label em,
+.uniForm .inlineLabels .label em{ display: block; position: absolute; left: auto; right: 0; font-style: normal; font-weight: bold; }
+.uniForm .inlineLabel em{ position: absolute; left: 7px; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* Messages */
+.uniForm #errorMsg,
+.uniForm .error{
+}
+.uniForm #errorMsg dt,
+.uniForm #errorMsg h3{
+}
+.uniForm #errorMsg dd{
+}
+.uniForm #errorMsg ol{
+}
+.uniForm #errorMsg ol li{
+}
+.uniForm .errorField{
+}
+
+.uniForm #OKMsg{
+}
+
+/* ------------------------------------------------------------------------------ */
+
+/* Columns */
+
+.uniForm .col{ float: left; }
+.uniForm .col.first{}
+.uniForm .col.last{}
+
+/* uni-form
+-------------------------------------------------------------- */
+
+/* Keep in mind that wherever you see 'Required property' it means that the property must exist */
+
+/* ------------------------------------------------------------------------------ */
+
+/* Generals */
+.uniForm fieldset{}
+.uniForm fieldset legend{ color: #333; font-weight: bold; font-size: 100%; margin: 0; padding: 1.5em 1.5em 1.5em 0; }
+
+/* This is the main unit that contains our form elements */
+.uniForm .ctrlHolder{ padding: 3px; border-bottom: 1px dotted #dfdfdf; }
+
+.uniForm .buttonHolder{ 
+    text-align: left; 
+    background: #CEDEEF url("../images/buttonHolder_bg.gif") no-repeat right;
+    margin: 3em 0 1em;
+    padding: 8px;
+}
+.uniForm .resetButton{ float: left; }
+.uniForm .primaryAction{ font-weight: bold; }
+
+/* This class gets added to div.ctrlHolder to highlight the row */
+.uniForm .focused{ background: #fffcdf; }
+
+/* .inlineLabel is used for inputs within labels - checkboxes and radio buttons */
+.uniForm .inlineLabel input,
+.uniForm .inlineLabels .inlineLabel input,
+.uniForm .blockLabels .inlineLabel input{ float: left; margin: 0 .4em 0 0; }
+.uniForm .inlineLabel span{ float: left; width: 90%; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* .blockLabels (default style, will be applied even if you don't class the parent element) */
+.uniForm .blockLabels .ctrlHolder{}
+
+.uniForm label,
+.uniForm .blockLabels label,
+.uniForm .blockLabels .label{ margin: 0 0 .5em 0; }
+
+.uniForm .textInput,
+.uniForm .blockLabels .textInput,
+.uniForm .blockLabels .fileUpload{ width: 43%; /* <- Required property */ }
+
+.uniForm .selectInput,
+.uniForm select,
+.uniForm .blockLabels .selectInput,
+.uniForm .blockLabels select{ width: 43.5%; /* <- Required property */ }
+.uniForm textarea,
+.uniForm .blockLabels textarea{ width: 43%; /* <- Required property */ height: 12em; }
+
+.uniForm .formHint,
+.uniForm .blockLabels .formHint{ width: 55%; /* <- Required property */ font-size: .9em; color: #777; position: relative; top: -.5em; }
+
+.uniForm .multiField,
+.uniForm .blockLabels .multiField{ width: 43%; }
+.uniForm .multiField .inlineLabel,
+.uniForm .blockLabels .multiField .inlineLabel{ display: block; margin: 0 0 .5em 0; }
+.uniForm .multiField .blockLabel,
+.uniForm .blockLabels .multiField .blockLabel{ width: 30%; margin: 0 10px 0 0; }
+.uniForm .multiField .blockLabel .textInput,
+.uniForm .multiField .blockLabel .selectInput,
+.uniForm .multiField .blockLabel select,
+.uniForm .blockLabels .multiField .blockLabel .textInput,
+.uniForm .blockLabels .multiField .blockLabel .selectInput,
+.uniForm .blockLabels .multiField .blockLabel select{ width: 100%; margin: .3em 0 0 0; }
+
+/* ------------------------------------------------------------------------------ */
+
+/* .inlineLabels */
+.uniForm .inlineLabels .ctrlHolder{}
+
+.uniForm .inlineLabels label,
+.uniForm .inlineLabels .label{ width: 20%; /* <- Required property */ margin: .3em 2% 0 0; /* <- Required property */ }
+
+.uniForm .inlineLabels .textInput,
+.uniForm .inlineLabels .fileUpload{ width: 35%; /* <- Required property */ }
+
+.uniForm .inlineLabels .selectInput,
+.uniForm .inlineLabels select{ width: 35%; /* <- Required property */ }
+
+.uniForm .inlineLabels textarea{  width: 35%; /* <- Required property */ height: 12em; }
+
+.uniForm .inlineLabels .formHint{ margin-top: 0; margin-left: 22%; font-size: .9em; color: #777; position: static; }
+
+.uniForm .inlineLabels .multiField{ width: 60%; /* <- Required property */ margin: 0 0 .3em 0; }
+.uniForm .inlineLabels .multiField .inlineLabel{ display: block; margin: 0 0 .5em 0; }
+.uniForm .inlineLabels .multiField .blockLabel{ float: left; width: 26%; margin: 0 3% 0 0; }
+.uniForm .inlineLabels .multiField .blockLabel .textInput,
+.uniForm .inlineLabels .multiField .blockLabel .selectInput,
+.uniForm .inlineLabels .multiField .blockLabel select{ width: 100%; margin: .3em 0 0 0; }
+
+/* Focus pseudoclasses */
+.uniForm .ctrlHolder .textInput:focus{ outline: none; /* Get rid of the 'glow' effect in WebKit, optional */ }
+.uniForm .ctrlHolder textarea:focus{ outline: none; /* Get rid of the 'glow' effect in WebKit, optional */ }
+.uniForm div.focused .formHint{ color: #333; }
+
+/* Columns (they are floated left by default) */
+.uniForm .col{ width: 37.9%; /* <- Required property */ margin: 0 2% 20px 0; }
+/* Use .first and .last classes to control the layout/spacing of your columns */
+.uniForm .col.first{ width: 39%; /* <- Required property */ float: left; clear: none; }
+.uniForm .col.last{ width: 39%; /* <- Required property */ float: right; clear: none; margin-right: 0; }
+
+/* Messages */
+.uniForm #errorMsg, .confirmpassworderror{ background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px; }
+.uniForm .error{ background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; }
+
+.uniForm #errorMsg dt, .uniForm #errorMsg h3{ margin: 0 0 .5em 0; font-size: 100%; line-height: 100%; font-weight: bold; }
+.uniForm #errorMsg dd{ margin: 0; padding: 0; }
+.uniForm #errorMsg ol{ margin: 0; padding: 0; list-style:none;}
+.uniForm #errorMsg ol li{ margin: 0; padding: 2px; list-style-position: inside; border-bottom: 1px dotted #df7d7d; position: relative; }
+.uniForm .errorField{ color: #af4c4c; margin: 0 0 6px 0; padding: 4px; background: #ffbfbf; }
+
+.uniForm #OKMsg, .confirmpasswordok{ background: #C8FFBF; border: 1px solid #A2EF95; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px; }
+.uniForm #OKMsg p{ margin: 0; }
+
+/*
+IT IS STRONGLY ADVISED TO MAKE YOUR CHANGES AFTER THIS COMMENT BY REPEATING (COPYING) THE SELECTOR FROM ABOVE, 
+AND MODIFYING IT WITH YOUR OWN PROPERTIES/VALUES. THIS IS RECOMMENDED BECAUSE IF YOU HAPPEN TO RUN INTO TROUBLE, 
+YOU CAN VERY EASILY REVERT TO A GENERIC STYLE OF UNI-FORM. BEST OF LUCK... 
+*/
+
+/* ------------------------------------------------------------------------------ */
+
+/* This is the main unit that contains our form elements */
+
+.uniForm .textInput, .uniForm .selectInput, .uniForm textarea {
+    background:#FFFFFF none repeat scroll 0 0;
+    color: #000000;
+    border: 1px solid #DFDFDF;
+    padding: 1px;
+}
+
+/* jquery-ui-custom
+-------------------------------------------------------------- */
+.ui-datepicker-calendar thead tr th {
+    background-image:none;
+    background-color:#FFFFFF;
+    color:#000000;
+}
+.ui-widget { font-family: 'Trebuchet MS', Arial, sans-serif; font-size: 100%; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: 'Trebuchet MS', Arial, sans-serif; font-size: 100%; }
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/icons/flags_sprite.png b/interface/web/themes/default-v2/icons/flags_sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..036a8aa41674a8e06d494a5f70e40734ed70b1f0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/flags_sprite.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/accept.png b/interface/web/themes/default-v2/icons/x12/accept.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a9f2e2ebcb0a18b80fc49712fa5c1d702bf5e4d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/accept.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/accept_blue.png b/interface/web/themes/default-v2/icons/x12/accept_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..47ab08aa864fffe0c02c10bd6362896f93f7adc8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/accept_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/accept_green.png b/interface/web/themes/default-v2/icons/x12/accept_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5d5709ef66251c23f213eea9c5f3ba5591aef6e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/accept_green.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/arrow_2_left_round.png b/interface/web/themes/default-v2/icons/x12/arrow_2_left_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..f52da180c94fbb63c4bcc4603dcba6db2cbd0a94
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/arrow_2_left_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/arrow_2_right_round.png b/interface/web/themes/default-v2/icons/x12/arrow_2_right_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..35fecf506c647b41354aae7a0fa58d752d31a339
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/arrow_2_right_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/arrow_left_blue_round.png b/interface/web/themes/default-v2/icons/x12/arrow_left_blue_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..aac963c1386f02904556236b51a794bec67fb2c3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/arrow_left_blue_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/arrow_right_blue_round.png b/interface/web/themes/default-v2/icons/x12/arrow_right_blue_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..71f5dd9fc53a083f47f3ee0671653905af78219c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/arrow_right_blue_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/article.png b/interface/web/themes/default-v2/icons/x12/article.png
new file mode 100644
index 0000000000000000000000000000000000000000..276094e3ca29518d7902fc76686fc39e1cfd3f32
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/article.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/article_text.png b/interface/web/themes/default-v2/icons/x12/article_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbc47e51e554e465e624088eed921578039e662f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/article_text.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/bar_graph.png b/interface/web/themes/default-v2/icons/x12/bar_graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..7df4a34c20951d4abc88b69868e4094540f8d7fc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/bar_graph.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/burst.png b/interface/web/themes/default-v2/icons/x12/burst.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dfc873a4e90fe00d71822a35da1f9cc3051535e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/burst.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/calendar.png b/interface/web/themes/default-v2/icons/x12/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..56ea24c2af964ca99dd334f3a0b1c0f3ea1f8f2b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/calendar.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/calendar2.png b/interface/web/themes/default-v2/icons/x12/calendar2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e82b31608c00b6dae14b0d84d7899ddef4669de3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/calendar2.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/cancel.png b/interface/web/themes/default-v2/icons/x12/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..bff763a22038c10253c41ddd0adeca402adc6d78
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/cancel.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/cancel_round.png b/interface/web/themes/default-v2/icons/x12/cancel_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..803532cf0937811afa6e7e71dfa9772a57d4d8ce
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/cancel_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/clock.png b/interface/web/themes/default-v2/icons/x12/clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..589bd9494750123f6b3aa853760edc58145e7df7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/clock.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/code.png b/interface/web/themes/default-v2/icons/x12/code.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc2b05f682e164d0292b9dd54185aafd9683511a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/code.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/comment_blue.png b/interface/web/themes/default-v2/icons/x12/comment_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..248ddb6b59edbd11614e865f57e30c8ae53b2f48
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/comment_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/dollar.png b/interface/web/themes/default-v2/icons/x12/dollar.png
new file mode 100644
index 0000000000000000000000000000000000000000..223f3bdae46f7d160c4cb1c1376d43c130e4c625
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/dollar.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/double_comment.png b/interface/web/themes/default-v2/icons/x12/double_comment.png
new file mode 100644
index 0000000000000000000000000000000000000000..21262ec2a9778775efb6db9a37e3e81a3d496828
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/double_comment.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/download.png b/interface/web/themes/default-v2/icons/x12/download.png
new file mode 100644
index 0000000000000000000000000000000000000000..3866bb20ba7291d6a675d95e25f4ef753d97adfd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/download.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/envelope.png b/interface/web/themes/default-v2/icons/x12/envelope.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b48a00b61551520fb1c82c15e06fc70e94a296c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/envelope.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_black.png b/interface/web/themes/default-v2/icons/x12/flag_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..66464debfd39743ad6b464ec5c188da3c25a63d3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/flag_black.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_blue.png b/interface/web/themes/default-v2/icons/x12/flag_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ced1c2b42d4ee802e0d8ea531c0991975ac7c17
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/flag_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_green.png b/interface/web/themes/default-v2/icons/x12/flag_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9fe8e4dafcce94a9c8a942db2dd28f61a255328
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/flag_green.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_orange.png b/interface/web/themes/default-v2/icons/x12/flag_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2b1090138fefd9f6fa809b31a7c9e99a45aa88b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/flag_orange.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_red.png b/interface/web/themes/default-v2/icons/x12/flag_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6b68395c6594b07b27758ee513a54439e99fbbc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/flag_red.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/flag_yellow.png b/interface/web/themes/default-v2/icons/x12/flag_yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..e197045cfe526b70a7f28791a703a35f4169fde7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/flag_yellow.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/folder.png b/interface/web/themes/default-v2/icons/x12/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..92c08caff5abed92661cb3dfb769dc50168e037f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/folder.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/info.png b/interface/web/themes/default-v2/icons/x12/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..150c5cb3cc06b7dac3dd60bdb7a2a2b04f32e830
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/info.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/link.png b/interface/web/themes/default-v2/icons/x12/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e7eb87035a0146bc71b72d621dc822f4351cec6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/link.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/lock.png b/interface/web/themes/default-v2/icons/x12/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..33a24b6f01c2ad05f187b4104a9d4fcd1a8e5212
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/lock.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/magnify.png b/interface/web/themes/default-v2/icons/x12/magnify.png
new file mode 100644
index 0000000000000000000000000000000000000000..730675e88dac72a9b386476d3dabc1acf5cbe4cf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/magnify.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/minus.png b/interface/web/themes/default-v2/icons/x12/minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a76b0e2975e9572061cad21226852b64e9a36e64
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/minus_round.png b/interface/web/themes/default-v2/icons/x12/minus_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d848055f5cdc746526ddb0b024b1dbe81cfd1b5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/minus_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/money.png b/interface/web/themes/default-v2/icons/x12/money.png
new file mode 100644
index 0000000000000000000000000000000000000000..6deb5756cfcfcb97b72cc8344a9446fe510cb09e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/money.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/new.png b/interface/web/themes/default-v2/icons/x12/new.png
new file mode 100644
index 0000000000000000000000000000000000000000..49bf82c95cc9a846af2a172ecb5d6d5682f71064
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/new.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/pencil.png b/interface/web/themes/default-v2/icons/x12/pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bfdad47421635a7e05c51eb8eb8a20982a4a18f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/pictures.png b/interface/web/themes/default-v2/icons/x12/pictures.png
new file mode 100644
index 0000000000000000000000000000000000000000..0478e958efb88b658ad2870fb08627f2c40af2c8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/pictures.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/plus.png b/interface/web/themes/default-v2/icons/x12/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3afb66734bfa629cd884718dadf02142d25d757
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/printer.png b/interface/web/themes/default-v2/icons/x12/printer.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3fc25f8814ba17dc91c3982184aca739001a777
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/printer.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/question_blue.png b/interface/web/themes/default-v2/icons/x12/question_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..97c006bd48c0d277825131e3046cd812fcc95299
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/question_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/refresh.png b/interface/web/themes/default-v2/icons/x12/refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c76d9b7c39c0656a486023fad440185e4e61fcd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/refresh.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/rss.png b/interface/web/themes/default-v2/icons/x12/rss.png
new file mode 100644
index 0000000000000000000000000000000000000000..e918050ae78acf46e11a874d1bff361a2eb3daa6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/rss.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/rss_round.png b/interface/web/themes/default-v2/icons/x12/rss_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..c436887723821660e32a64043f7158ea637a8662
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/rss_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/security_green.png b/interface/web/themes/default-v2/icons/x12/security_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6818153ca30909a14db6ff3d542d3cd8770efa7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/security_green.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/security_orange.png b/interface/web/themes/default-v2/icons/x12/security_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1ba672d95695796898a8287c3bb86bcba77c1cd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/security_orange.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/security_red.png b/interface/web/themes/default-v2/icons/x12/security_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2f1bae8f40ec481498dc6bb69e823cfe34df362
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/security_red.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/star.png b/interface/web/themes/default-v2/icons/x12/star.png
new file mode 100644
index 0000000000000000000000000000000000000000..77cbacdd07eddb0bd9c9f13bd6a893127e69e1dd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/star.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/star_blue.png b/interface/web/themes/default-v2/icons/x12/star_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bb59dfba15d8d6bd0f3d19591dc3c7e66014765
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/star_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/stop.png b/interface/web/themes/default-v2/icons/x12/stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..86a01e00781284c371bc42464e4225e9ea4537c0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/stop.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/stop_round.png b/interface/web/themes/default-v2/icons/x12/stop_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c9963e99b1446867afde21dad729ac2bae49f22
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/stop_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/upload.png b/interface/web/themes/default-v2/icons/x12/upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1810b31b5ac4ea872a798ce7e1c89740fc6cbdf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/upload.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/world.png b/interface/web/themes/default-v2/icons/x12/world.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7f9a8e8e77c606d08e9dce80f2fb6ac2e24539b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/world.png differ
diff --git a/interface/web/themes/default-v2/icons/x12/world2.png b/interface/web/themes/default-v2/icons/x12/world2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2855f3bcce50f9203b636d35eefe2b1e64dc881b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x12/world2.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/accept.png b/interface/web/themes/default-v2/icons/x16-list/accept.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0f56047f99201d98034229b9346111d361457dd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/accept.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/accept_blue.png b/interface/web/themes/default-v2/icons/x16-list/accept_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..128614830de4dcf06bad4a47733dffded999c57a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/accept_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/accept_green.png b/interface/web/themes/default-v2/icons/x16-list/accept_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..043e5c694399b3f548f1fb9623f5a74fddcf5c3f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/accept_green.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/arrow_2_left_round.png b/interface/web/themes/default-v2/icons/x16-list/arrow_2_left_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..517ee8e6375863dc9339ae0ba23221b6b84f70c6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/arrow_2_left_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/arrow_2_right_round.png b/interface/web/themes/default-v2/icons/x16-list/arrow_2_right_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..14de6fe9b21c78ddfce7930051708f85f126ce09
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/arrow_2_right_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/arrow_left_blue_round.png b/interface/web/themes/default-v2/icons/x16-list/arrow_left_blue_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..44f7ea8fde9ffd93b96968d97528804fe30ba44e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/arrow_left_blue_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/arrow_right_blue_round.png b/interface/web/themes/default-v2/icons/x16-list/arrow_right_blue_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..e321918ac1bbe3789316f18023ebc61e2798eb1e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/arrow_right_blue_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/article.png b/interface/web/themes/default-v2/icons/x16-list/article.png
new file mode 100644
index 0000000000000000000000000000000000000000..6beaafc4fdbb5cbb382e0e2f2434df133856bd83
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/article.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/article_text.png b/interface/web/themes/default-v2/icons/x16-list/article_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e0b9de5bdb92439061543b9985a5b591997b7c9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/article_text.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/bar_graph.png b/interface/web/themes/default-v2/icons/x16-list/bar_graph.png
new file mode 100644
index 0000000000000000000000000000000000000000..31920e0582058d7665c094910e2ed47445cde96f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/bar_graph.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/burst.png b/interface/web/themes/default-v2/icons/x16-list/burst.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd9ddd6ce2d7eac8ed0bdfa325f42861812fb12e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/burst.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/calendar.png b/interface/web/themes/default-v2/icons/x16-list/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..f278eb34cd5afc1be22a52a81f4a0c0bcf949443
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/calendar.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/calendar2.png b/interface/web/themes/default-v2/icons/x16-list/calendar2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b121c78e58e5d41fefea64d19a896a8e6d347333
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/calendar2.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/cancel.png b/interface/web/themes/default-v2/icons/x16-list/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d40cc63a584399a374541ad8b41211104952f48
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/cancel.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/cancel_round.png b/interface/web/themes/default-v2/icons/x16-list/cancel_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..a987e300750e80088855fbc4099da67189cf2a21
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/cancel_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/clock.png b/interface/web/themes/default-v2/icons/x16-list/clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..f770a9c671fd9b5091fa31beb1c1d12dddba5eb2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/clock.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/code.png b/interface/web/themes/default-v2/icons/x16-list/code.png
new file mode 100644
index 0000000000000000000000000000000000000000..3791cb592817f1475b17061c962fe113b92c3607
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/code.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/comment_blue.png b/interface/web/themes/default-v2/icons/x16-list/comment_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bc780f4118869648de4b88b2eb4a1ce047e068f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/comment_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/dollar.png b/interface/web/themes/default-v2/icons/x16-list/dollar.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8a2b53051dd55feb3c2794e718c1c2e0db44c4f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/dollar.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/double_comment.png b/interface/web/themes/default-v2/icons/x16-list/double_comment.png
new file mode 100644
index 0000000000000000000000000000000000000000..574729c16edc05ca302768fed50595a99ee3ddfe
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/double_comment.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/download.png b/interface/web/themes/default-v2/icons/x16-list/download.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a4ec44c7128ae504de14dd830a4685faf3bc9e2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/download.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/envelope.png b/interface/web/themes/default-v2/icons/x16-list/envelope.png
new file mode 100644
index 0000000000000000000000000000000000000000..a98b125f1160b3148d8f0ee75d9c6211c4a776a1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/envelope.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_black.png b/interface/web/themes/default-v2/icons/x16-list/flag_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b453a5adaf7264c42f68aca488c6ea9598e33eb
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/flag_black.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_blue.png b/interface/web/themes/default-v2/icons/x16-list/flag_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e3609259fb0ce3b4cdc1980a55be9836e462ad7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/flag_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_green.png b/interface/web/themes/default-v2/icons/x16-list/flag_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac6bfb81c18cb6505ecac90d725fe337b46b53e8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/flag_green.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_orange.png b/interface/web/themes/default-v2/icons/x16-list/flag_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..639cdfc0dec82180ddbb4d118cb3691793e12dcc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/flag_orange.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_red.png b/interface/web/themes/default-v2/icons/x16-list/flag_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..08a5ea575fe76a70ffe8690fa114a70ae03a547e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/flag_red.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/flag_yellow.png b/interface/web/themes/default-v2/icons/x16-list/flag_yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf137827010d1e7ba2df497f24df1f2bf1ae925a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/flag_yellow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/folder.png b/interface/web/themes/default-v2/icons/x16-list/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..1327b54b318889bc3e2680c5a05e616a58ddd669
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/folder.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/info.png b/interface/web/themes/default-v2/icons/x16-list/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..da02eae4f9921a8fbf20c235a7bf87cbe2d547ec
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/info.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/link.png b/interface/web/themes/default-v2/icons/x16-list/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..10df4aee8b87f53ef0b7b536e2024a13a08abe24
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/link.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/lock.png b/interface/web/themes/default-v2/icons/x16-list/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c53ec5f4ffb5c20a964c37de47174aab1d0b81a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/lock.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/magnify.png b/interface/web/themes/default-v2/icons/x16-list/magnify.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c47b23469e6ee2a693ecd429565b2d7f58d2881
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/magnify.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/minus.png b/interface/web/themes/default-v2/icons/x16-list/minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..be99e5b7489dcd3f5052c88faa70372ac585c78d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/minus_round.png b/interface/web/themes/default-v2/icons/x16-list/minus_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..e246f112a7ed309bc9289bf76e8c0db0c5da43e6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/minus_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/money.png b/interface/web/themes/default-v2/icons/x16-list/money.png
new file mode 100644
index 0000000000000000000000000000000000000000..915c983bd180033ab0dc54e7b15dca97a34ed316
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/money.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/new.png b/interface/web/themes/default-v2/icons/x16-list/new.png
new file mode 100644
index 0000000000000000000000000000000000000000..89d4487823bd64744f08ae3fd1a3035f3005eb4c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/new.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/pencil.png b/interface/web/themes/default-v2/icons/x16-list/pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..f13405605f93032fbc5c4d9f49165d0bdd9dc13d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/pictures.png b/interface/web/themes/default-v2/icons/x16-list/pictures.png
new file mode 100644
index 0000000000000000000000000000000000000000..948ad9ebcc4fb6fe64c221b4a5f1ac32d0925d97
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/pictures.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/plus.png b/interface/web/themes/default-v2/icons/x16-list/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c343531cb45ebaa58cdbcc5193bf6a4d5b4b4ff
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/printer.png b/interface/web/themes/default-v2/icons/x16-list/printer.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe362609705fd0715eb46102a4662fbeecb8c48a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/printer.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/question_blue.png b/interface/web/themes/default-v2/icons/x16-list/question_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f5b3608bd87e9d1065b8fd0c957a0bce912e105
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/question_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/refresh.png b/interface/web/themes/default-v2/icons/x16-list/refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..a63077d03f11f7891a1043776a4f13ceea129e34
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/refresh.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/rss.png b/interface/web/themes/default-v2/icons/x16-list/rss.png
new file mode 100644
index 0000000000000000000000000000000000000000..b35840d491b9463b2cbe79124cfaf483fc5561d2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/rss.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/rss_round.png b/interface/web/themes/default-v2/icons/x16-list/rss_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..27ce67d2b3ecec7154c442a68414f53fd0b1062e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/rss_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/security_green.png b/interface/web/themes/default-v2/icons/x16-list/security_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..38afbbb2095225c42bc20e1de30ca76f0a6d7075
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/security_green.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/security_orange.png b/interface/web/themes/default-v2/icons/x16-list/security_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c5bad763c62abaa2ee7749de532aa56f7af364c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/security_orange.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/security_red.png b/interface/web/themes/default-v2/icons/x16-list/security_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..c469be0a06b1ccc3124c29f003de3f50256db08c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/security_red.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/star.png b/interface/web/themes/default-v2/icons/x16-list/star.png
new file mode 100644
index 0000000000000000000000000000000000000000..70a227c3ae024d7d38862dd5c5ff5a7d42c83231
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/star.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/star_blue.png b/interface/web/themes/default-v2/icons/x16-list/star_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..c49e74b13e2b92da24f09f4322f1397dcd91e1fe
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/star_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/stop.png b/interface/web/themes/default-v2/icons/x16-list/stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..65fa261e423de3e392f498a76fb37f857b498571
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/stop.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/stop_round.png b/interface/web/themes/default-v2/icons/x16-list/stop_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cc285205dbe17d9b35b960115385429254dd72f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/stop_round.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/upload.png b/interface/web/themes/default-v2/icons/x16-list/upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..e45598e0b1e520b25aaf13f141ec1e1b3e06b9ea
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/upload.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/world.png b/interface/web/themes/default-v2/icons/x16-list/world.png
new file mode 100644
index 0000000000000000000000000000000000000000..a94d9a6247d89a12a30f23d96f7db70de53b219a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/world.png differ
diff --git a/interface/web/themes/default-v2/icons/x16-list/world2.png b/interface/web/themes/default-v2/icons/x16-list/world2.png
new file mode 100644
index 0000000000000000000000000000000000000000..58e7e6e4dd91ae8f4f306b1e4ebff47ab37b27a9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16-list/world2.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book.png b/interface/web/themes/default-v2/icons/x16/address_book.png
new file mode 100644
index 0000000000000000000000000000000000000000..923e0bc8422955a4b7aecc4b0371fdaea9f99888
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/address_book.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book__arrow.png b/interface/web/themes/default-v2/icons/x16/address_book__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..0af9c50b487d2ca51474949700553ee27885ef5b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/address_book__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book__exclamation.png b/interface/web/themes/default-v2/icons/x16/address_book__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..abd5fa9f6f19c921f233f6fddf5c9245427109a3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/address_book__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book__minus.png b/interface/web/themes/default-v2/icons/x16/address_book__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fb998230d2e0afd312dffe52b180435de680c7b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/address_book__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book__pencil.png b/interface/web/themes/default-v2/icons/x16/address_book__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..d56768d3e4b4410cc58109ec0d83dc3e027c699f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/address_book__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book__plus.png b/interface/web/themes/default-v2/icons/x16/address_book__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..af396b41050db1bc095eca7b12686d2569710525
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/address_book__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/address_book_blue.png b/interface/web/themes/default-v2/icons/x16/address_book_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f855e7421f91af66e1f0517a05b172d732d8790
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/address_book_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow.png b/interface/web/themes/default-v2/icons/x16/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..82cfae37cce484b4f63c7cabf3eb6ab65fe8ccd5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_000_small.png b/interface/web/themes/default-v2/icons/x16/arrow_000_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..02867c8e314d3df5a02fb7612ae19c136be8f943
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_000_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_045.png b/interface/web/themes/default-v2/icons/x16/arrow_045.png
new file mode 100644
index 0000000000000000000000000000000000000000..6dbd51635918c324d26667c93b903601b7e14e8f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_045.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_045_small.png b/interface/web/themes/default-v2/icons/x16/arrow_045_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d850694e6429d193e18e99f099d1f6014e29f40
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_045_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_090.png b/interface/web/themes/default-v2/icons/x16/arrow_090.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e670dd348da116ab08d0572011f39c22304f598
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_090.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_090_small.png b/interface/web/themes/default-v2/icons/x16/arrow_090_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd82139450ab3c89bcfb5693e08aff49bf687077
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_090_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_135.png b/interface/web/themes/default-v2/icons/x16/arrow_135.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0882c227845eae464b8c5a49ecbf2837c2fdf54
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_135.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_135_small.png b/interface/web/themes/default-v2/icons/x16/arrow_135_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..b51c5c67d59bfae5a9ba4d029aa1cc10657c1548
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_135_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_180.png b/interface/web/themes/default-v2/icons/x16/arrow_180.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1e5e6bc61f8403e588f24a32090b5ccae1eef74
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_180.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_180_small.png b/interface/web/themes/default-v2/icons/x16/arrow_180_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..431b8384aa5ed0772f34cb824e0bc891daf63b14
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_180_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_225.png b/interface/web/themes/default-v2/icons/x16/arrow_225.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d5c216b11ec9c6fa9b3819b9de55ce63e5119fa
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_225.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_225_small.png b/interface/web/themes/default-v2/icons/x16/arrow_225_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..f082991f028b0040350f0ad98915892a76af9b1f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_225_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_270.png b/interface/web/themes/default-v2/icons/x16/arrow_270.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc00395a32d594e944b5ba54c8a35b4048d372cc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_270.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_270_small.png b/interface/web/themes/default-v2/icons/x16/arrow_270_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..4971995972f94f19b18dae22999a5297db71563f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_270_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_315.png b/interface/web/themes/default-v2/icons/x16/arrow_315.png
new file mode 100644
index 0000000000000000000000000000000000000000..fab81cdb4b27a8d4a9e30618aef139650474f6ac
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_315.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_315_small.png b/interface/web/themes/default-v2/icons/x16/arrow_315_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..868724a4b72b948eca65f48d828f20b911f92dbd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_315_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle.png b/interface/web/themes/default-v2/icons/x16/arrow_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..8087eeaa43fc931fb04fb4d2a77efbd7ecb7940f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_circle.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle_135.png b/interface/web/themes/default-v2/icons/x16/arrow_circle_135.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ddb81b1aac080155f41f5132431f572401baed4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_circle_135.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle_225.png b/interface/web/themes/default-v2/icons/x16/arrow_circle_225.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bec0d1063ffd36892a3de637d4a95a1ddaf0688
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_circle_225.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle_315.png b/interface/web/themes/default-v2/icons/x16/arrow_circle_315.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a4f23eaf5648fa632f1644b2f148fe2c4f19253
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_circle_315.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle_double.png b/interface/web/themes/default-v2/icons/x16/arrow_circle_double.png
new file mode 100644
index 0000000000000000000000000000000000000000..47eafce4c7cbf24635334e43444a3123e9fdd15e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_circle_double.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_circle_double_135.png b/interface/web/themes/default-v2/icons/x16/arrow_circle_double_135.png
new file mode 100644
index 0000000000000000000000000000000000000000..289419c8310cdffc598a644ef93e8aec2ea20dc3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_circle_double_135.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_skip.png b/interface/web/themes/default-v2/icons/x16/arrow_skip.png
new file mode 100644
index 0000000000000000000000000000000000000000..860332d754ed5a288875c5ad98ea4df8f2d87ff6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_skip.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_skip_090.png b/interface/web/themes/default-v2/icons/x16/arrow_skip_090.png
new file mode 100644
index 0000000000000000000000000000000000000000..2138dfd5330816811febf698305a70ef93f47b05
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_skip_090.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_skip_180.png b/interface/web/themes/default-v2/icons/x16/arrow_skip_180.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d0612926bc6dd0ddb52fb865c18c0b2c8c47fe0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_skip_180.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_skip_270.png b/interface/web/themes/default-v2/icons/x16/arrow_skip_270.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c37e6e8b8aacd1dc6de3b257003d24cbf8c3779
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_skip_270.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_stop.png b/interface/web/themes/default-v2/icons/x16/arrow_stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..702b9b7b791ab1ffbc3ceb962b75434421d1f156
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_stop.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_stop_090.png b/interface/web/themes/default-v2/icons/x16/arrow_stop_090.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f65f5ce25f5e04bac733f79a570255aa3fc4d24
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_stop_090.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_stop_180.png b/interface/web/themes/default-v2/icons/x16/arrow_stop_180.png
new file mode 100644
index 0000000000000000000000000000000000000000..573ff4889bd49f1a63d35d9c4e7e1b440c43629e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_stop_180.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/arrow_stop_270.png b/interface/web/themes/default-v2/icons/x16/arrow_stop_270.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebb649f56503f191d6c5aaa105f622ca2fd39857
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/arrow_stop_270.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer.png b/interface/web/themes/default-v2/icons/x16/auction_hammer.png
new file mode 100644
index 0000000000000000000000000000000000000000..be94131e3cdf37f8fe773a12de32d5008619e489
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/auction_hammer.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer__arrow.png b/interface/web/themes/default-v2/icons/x16/auction_hammer__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..199bc64ee8ef4b33e8a833f7fbb27347a444c571
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/auction_hammer__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer__exclamation.png b/interface/web/themes/default-v2/icons/x16/auction_hammer__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f44985dbd69cd48d2dafa1a832da55a05d6c678
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/auction_hammer__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer__minus.png b/interface/web/themes/default-v2/icons/x16/auction_hammer__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..70ddbec91f218cb4b218eaab2c19110b1933cdd6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/auction_hammer__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer__pencil.png b/interface/web/themes/default-v2/icons/x16/auction_hammer__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac7a9c9fa0da59cd8b9c5c840fbc554f5325bc6d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/auction_hammer__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer__plus.png b/interface/web/themes/default-v2/icons/x16/auction_hammer__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..587f55686d5ac21629007189937719ae23b040f3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/auction_hammer__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/auction_hammer_gavel.png b/interface/web/themes/default-v2/icons/x16/auction_hammer_gavel.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee46a7e905379263ed3b08137c3ad815296424b1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/auction_hammer_gavel.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon.png b/interface/web/themes/default-v2/icons/x16/balloon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3f88a0809ea7a4a91d43b982c253d1ef755e751
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloon.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon__arrow.png b/interface/web/themes/default-v2/icons/x16/balloon__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3e2a7febc8404b0657f6fc82739113d60182d7d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloon__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon__exclamation.png b/interface/web/themes/default-v2/icons/x16/balloon__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..102e2cc1ce67533a821798646250715f80ae2cd9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloon__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon__minus.png b/interface/web/themes/default-v2/icons/x16/balloon__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..2aa4cd9dcc0457fef169e91c5cfbc79f31ff3149
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloon__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon__pencil.png b/interface/web/themes/default-v2/icons/x16/balloon__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..d835dc087a10de621ce597ed28f9b87eab0773e8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloon__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon__plus.png b/interface/web/themes/default-v2/icons/x16/balloon__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d171b9bd7097605197bc4e33ca11b875027d642b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloon__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon_left.png b/interface/web/themes/default-v2/icons/x16/balloon_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..da8c32b1490ed0031992288358f624cf198e0927
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloon_left.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon_small.png b/interface/web/themes/default-v2/icons/x16/balloon_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..f92545e84acf62972c86d42057a1fb3f2e31df73
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloon_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloon_small_left.png b/interface/web/themes/default-v2/icons/x16/balloon_small_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..34a1c02ad4bb2ebd0fde3384ce14b6893ab4993b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloon_small_left.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons.png b/interface/web/themes/default-v2/icons/x16/balloons.png
new file mode 100644
index 0000000000000000000000000000000000000000..4508686488e37c7f0cc74b007469f685d7777810
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloons.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons_arrow.png b/interface/web/themes/default-v2/icons/x16/balloons_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..15a3210547e70ac21150aff47e650e4467909463
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloons_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons_exclamation.png b/interface/web/themes/default-v2/icons/x16/balloons_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dbec2e2cd42374b1cdfb30977fa0c604e689734
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloons_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons_minus.png b/interface/web/themes/default-v2/icons/x16/balloons_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..2af8dd3ffb1ee9797ca26f4790808bae4b368167
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloons_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons_pencil.png b/interface/web/themes/default-v2/icons/x16/balloons_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f6db51fbcbeca996205f919058e063bb8c17e9a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloons_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/balloons_plus.png b/interface/web/themes/default-v2/icons/x16/balloons_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e14e8c27afef17b5d55097c014b66305ba248d97
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/balloons_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid.png b/interface/web/themes/default-v2/icons/x16/bandaid.png
new file mode 100644
index 0000000000000000000000000000000000000000..05e02f66674af6352bf75f4627bbd30de072526f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bandaid.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_arrow.png b/interface/web/themes/default-v2/icons/x16/bandaid_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fab58928156b669ef6728ec2b616fda9299a0e9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bandaid_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_exclamation.png b/interface/web/themes/default-v2/icons/x16/bandaid_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fc2d8b51b7a6873841dc73009f9132ea8de3bbf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bandaid_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_minus.png b/interface/web/themes/default-v2/icons/x16/bandaid_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a7842360c9bbd04a622060acfccaca140694d90
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bandaid_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_pencil.png b/interface/web/themes/default-v2/icons/x16/bandaid_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d7f08ceed93e321298d956a9c2a940fc20e2a80
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bandaid_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_plus.png b/interface/web/themes/default-v2/icons/x16/bandaid_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..3da2d463e34487009185d611fd5799e11a1a2ad0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bandaid_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bandaid_small.png b/interface/web/themes/default-v2/icons/x16/bandaid_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..30ad6aee130f7ef7d312648fca33cb59abb9aca1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bandaid_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank.png b/interface/web/themes/default-v2/icons/x16/bank.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f7d646299c95fceb6c4e99add2ead28ffc3bbd9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bank.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank_arrow.png b/interface/web/themes/default-v2/icons/x16/bank_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad30c35502908fe06f67cdcdb08ef840d2a10569
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bank_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank_exclamation.png b/interface/web/themes/default-v2/icons/x16/bank_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..10bf86ce4d0ecf66f2be6ba643bf313f6973f379
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bank_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank_minus.png b/interface/web/themes/default-v2/icons/x16/bank_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..0edcebce1527f6a985aeb50dd8e392b664cc2d14
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bank_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank_pencil.png b/interface/web/themes/default-v2/icons/x16/bank_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e98dfc10870576573dddef28bc5622eea44c2de
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bank_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bank_plus.png b/interface/web/themes/default-v2/icons/x16/bank_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..17a55d1d5208288618e20ac9d83d0a3c2b09089f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bank_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell.png b/interface/web/themes/default-v2/icons/x16/bell.png
new file mode 100644
index 0000000000000000000000000000000000000000..3be57e07a5366b7f9e1f10f1de713adfe1908420
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bell.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell__arrow.png b/interface/web/themes/default-v2/icons/x16/bell__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..82ff8a91e8869d709afa28edcec3255c81becca7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bell__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell__exclamation.png b/interface/web/themes/default-v2/icons/x16/bell__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..2eddd3d11ed7f06b1a1d183a2d27756f5486229f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bell__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell__minus.png b/interface/web/themes/default-v2/icons/x16/bell__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b50d7261bd7da38b707b35fb789aef0aa4b5c09
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bell__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell__pencil.png b/interface/web/themes/default-v2/icons/x16/bell__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..71e06cf20abe86115d86ae02bd926f1f1da9964f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bell__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell__plus.png b/interface/web/themes/default-v2/icons/x16/bell__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..655a29e97a738a0e390b53cccd23e863b7e4c643
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bell__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bell_disable.png b/interface/web/themes/default-v2/icons/x16/bell_disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..acff16b14486b1248a10a7cd1dd53f28487ad097
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bell_disable.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin.png b/interface/web/themes/default-v2/icons/x16/bin.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fe988052a9582081778d449ef46247b2241ba11
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bin.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin__arrow.png b/interface/web/themes/default-v2/icons/x16/bin__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..1191c51775b8c457bc438991351d999eefad97da
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bin__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin__exclamation.png b/interface/web/themes/default-v2/icons/x16/bin__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..d87347ec6a3286122686af03d1a880bc8e6d8aa4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bin__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin__minus.png b/interface/web/themes/default-v2/icons/x16/bin__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c70f25b5cd66a5958d0836f6bb199801fdee43f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bin__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin__pencil.png b/interface/web/themes/default-v2/icons/x16/bin__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f7a531e94e9e3ce5dea4c9ec10464b75b51e032
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bin__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin__plus.png b/interface/web/themes/default-v2/icons/x16/bin__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b1a05c8a7f34eea6d370ee15dadc3833f3905a5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bin__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bin_full.png b/interface/web/themes/default-v2/icons/x16/bin_full.png
new file mode 100644
index 0000000000000000000000000000000000000000..463c7d6aaa1fea3ed62c24b87e089bc5d8859b3c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bin_full.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular.png b/interface/web/themes/default-v2/icons/x16/binocular.png
new file mode 100644
index 0000000000000000000000000000000000000000..8279f4584ae1847e328f5ae0dc35ae1015d844d6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/binocular.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular_arrow.png b/interface/web/themes/default-v2/icons/x16/binocular_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..dead761828fcd908fd62956740f75485a69623d8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/binocular_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular_exclamation.png b/interface/web/themes/default-v2/icons/x16/binocular_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c7550cca6442b5df5329b4610a5fc691c6b5d36
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/binocular_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular_minus.png b/interface/web/themes/default-v2/icons/x16/binocular_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..63cd02434be2e168cf7d76b7a4de8894b531e988
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/binocular_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular_pencil.png b/interface/web/themes/default-v2/icons/x16/binocular_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9c8ac1eb7f403494467679ed921a20d15225c40
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/binocular_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/binocular_plus.png b/interface/web/themes/default-v2/icons/x16/binocular_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac0184daeead7b84b23f5c31f2be195367bed7f9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/binocular_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog.png b/interface/web/themes/default-v2/icons/x16/blog.png
new file mode 100644
index 0000000000000000000000000000000000000000..09267a222cbef0bad211947d3c501b4ae8320fb7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blog.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog__arrow.png b/interface/web/themes/default-v2/icons/x16/blog__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..500ec141287ab8582f9b7cf53993c50b552e08cf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blog__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog__exclamation.png b/interface/web/themes/default-v2/icons/x16/blog__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7a4007c0119fcfc0167047b3073aa6fe244a5fe
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blog__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog__minus.png b/interface/web/themes/default-v2/icons/x16/blog__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e02d945f26b2d2c7448f18c21e701145dda06993
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blog__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog__pencil.png b/interface/web/themes/default-v2/icons/x16/blog__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec5a3b2c3a7860c1e29213dc72b5539d8dd5ba35
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blog__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog__plus.png b/interface/web/themes/default-v2/icons/x16/blog__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4efa66df5028d7d1a1120be9ecf7a0f63c9c2275
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blog__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blog_blue.png b/interface/web/themes/default-v2/icons/x16/blog_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a7b216be6f639093543dc2046a265227f70ecee
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blog_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs.png b/interface/web/themes/default-v2/icons/x16/blogs.png
new file mode 100644
index 0000000000000000000000000000000000000000..6539158e527133665b5ede174b7a2719c0cfde52
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blogs.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_arrow.png b/interface/web/themes/default-v2/icons/x16/blogs_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d7b0ff3f26f1015834a9c97dde117a26e6bce30
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blogs_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_exclamation.png b/interface/web/themes/default-v2/icons/x16/blogs_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..7983deb8971ec29380125738854501297cb16afe
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blogs_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_minus.png b/interface/web/themes/default-v2/icons/x16/blogs_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..3493ff6075ff5297e7de9365392d3a7c7e018bff
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blogs_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_pencil.png b/interface/web/themes/default-v2/icons/x16/blogs_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..d06dd1c8a73bebfc597a2d0e4f79241667b5d6a5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blogs_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_plus.png b/interface/web/themes/default-v2/icons/x16/blogs_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c48266531c9bc63a4fe110743247ff2044966bb2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blogs_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/blogs_stack.png b/interface/web/themes/default-v2/icons/x16/blogs_stack.png
new file mode 100644
index 0000000000000000000000000000000000000000..e568c075960498a04a959ab861b4a3e0d6771675
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/blogs_stack.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/book.png b/interface/web/themes/default-v2/icons/x16/book.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d4bf1823bae23399ce0050eee452b8a9dd50bd5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/book.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/book__arrow.png b/interface/web/themes/default-v2/icons/x16/book__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a66b4ef022ad0f20489a7280eead9b3b9c9db8f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/book__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/book__exclamation.png b/interface/web/themes/default-v2/icons/x16/book__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bd34df3d1f46d16f3a1ac14e31f116e5a7af065
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/book__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/book__minus.png b/interface/web/themes/default-v2/icons/x16/book__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..305ca0c1d054913a99db87b080e5cd88479c4d4f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/book__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/book__pencil.png b/interface/web/themes/default-v2/icons/x16/book__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..c045fc8b15a478c38fd8d708633085d4fae13372
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/book__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/book__plus.png b/interface/web/themes/default-v2/icons/x16/book__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..23260e555dfa870ac67454af67a0295bf74cb70f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/book__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/book_brown.png b/interface/web/themes/default-v2/icons/x16/book_brown.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7ba58f3d58b02a60fcb80fc73b2acccb571ff6e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/book_brown.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/book_small.png b/interface/web/themes/default-v2/icons/x16/book_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..298d6b3b2c6dc13d9e12f0dd34f4573b09f7f0ee
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/book_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/book_small_brown.png b/interface/web/themes/default-v2/icons/x16/book_small_brown.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d5acf299a0e617ecf51d0d512f0842405b157da
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/book_small_brown.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark.png b/interface/web/themes/default-v2/icons/x16/bookmark.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bb98fd547de0e794569a7760eff1ab1b9698ee3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__arrow.png b/interface/web/themes/default-v2/icons/x16/bookmark__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cc6e5b23ff368a706d5314757f5cf8698e7c1af
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__exclamation.png b/interface/web/themes/default-v2/icons/x16/bookmark__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..288af864ca69948ed69b65ec36eb9d42f0de5e76
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__minus.png b/interface/web/themes/default-v2/icons/x16/bookmark__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e36870326885ba435457d29984221fb1372d629e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__pencil.png b/interface/web/themes/default-v2/icons/x16/bookmark__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..55b42813cd13571048b76be7d4faff06477140cc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__plus.png b/interface/web/themes/default-v2/icons/x16/bookmark__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..51978f1886356dbb3a0fc75596c18ed59f7b5ead
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark__small.png b/interface/web/themes/default-v2/icons/x16/bookmark__small.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3a92cbc8477fad5d88332e7d6ac1f061a02838c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark__small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book.png b/interface/web/themes/default-v2/icons/x16/bookmark_book.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf55d2049bf20b453fd93ac9a1c567616c3c73da
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_book.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book_arrow.png b/interface/web/themes/default-v2/icons/x16/bookmark_book_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d0f980a044234e1c3ea1370328381dad4fd9d5e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_book_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book_exclamation.png b/interface/web/themes/default-v2/icons/x16/bookmark_book_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..656a504b94a8f896b2b02006715315d7db62641e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_book_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book_minus.png b/interface/web/themes/default-v2/icons/x16/bookmark_book_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f736089709186bab85dfbdaa68b00be48f38226
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_book_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book_pencil.png b/interface/web/themes/default-v2/icons/x16/bookmark_book_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..20497977a0dac2f70d989b792ef739ee86d6aede
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_book_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_book_plus.png b/interface/web/themes/default-v2/icons/x16/bookmark_book_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1eae3554b9cb70fc1b7b54227504180154b8b1f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_book_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document.png b/interface/web/themes/default-v2/icons/x16/bookmark_document.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa8cc9b59320b9c92898e9690976798bbdb607d9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_document.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document_arrow.png b/interface/web/themes/default-v2/icons/x16/bookmark_document_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..082225822377563482650fddb35b4759ed381b90
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_document_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document_exclamation.png b/interface/web/themes/default-v2/icons/x16/bookmark_document_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d34e49763105f1dbf7f0401d8a67aaa1af279e6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_document_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document_minus.png b/interface/web/themes/default-v2/icons/x16/bookmark_document_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..548690a98fb79028e326db926ec0bc319866b117
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_document_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document_pencil.png b/interface/web/themes/default-v2/icons/x16/bookmark_document_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..63c0709f31eded01676aceed1ee74e1aca5591a6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_document_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_document_plus.png b/interface/web/themes/default-v2/icons/x16/bookmark_document_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..479c7445ffb7827108fccb649d86cb11fb0e4d32
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_document_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd24879d63194be0b3aca530ffb8ba125ad9bdd7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_folder.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder_arrow.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca8fcc7fd111164413287251e6c7e96023929981
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_folder_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder_exclamation.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c87cd3ea355dbcf5da0ef85f6d8ab5319de501c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_folder_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder_minus.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ec8edb67d925b4aeed37387a4b0b8ac587d0c16
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_folder_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder_pencil.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..d45d29cada2234d2bcf578a3a527b6696cb21c39
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_folder_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/bookmark_folder_plus.png b/interface/web/themes/default-v2/icons/x16/bookmark_folder_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..45dc2e8921f90a9841b84dc486d4d02cb3036691
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/bookmark_folder_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/books.png b/interface/web/themes/default-v2/icons/x16/books.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7d6eac82d857fb8d0291973006c0efd02281f08
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/books.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/books__arrow.png b/interface/web/themes/default-v2/icons/x16/books__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..219ae0bf37a37d4a27737c6edf893a51d0968192
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/books__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/books__exclamation.png b/interface/web/themes/default-v2/icons/x16/books__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..f78c16ee2c778feadba797518665180ada31c10c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/books__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/books__minus.png b/interface/web/themes/default-v2/icons/x16/books__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6da011f424f8429e30086d7316c949d6c92fc30b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/books__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/books__pencil.png b/interface/web/themes/default-v2/icons/x16/books__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1a57ed572464c740de1f1965a2abbe0b1d51733
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/books__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/books__plus.png b/interface/web/themes/default-v2/icons/x16/books__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..82e1063df938547fea473410a5ffd576e9828a25
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/books__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/books_brown.png b/interface/web/themes/default-v2/icons/x16/books_brown.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fb21ae301fa956332994c0cd6f44348dc8b5d62
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/books_brown.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/books_stack.png b/interface/web/themes/default-v2/icons/x16/books_stack.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb525bd0d478bb2b55d022d8c564eb691014fb26
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/books_stack.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/box.png b/interface/web/themes/default-v2/icons/x16/box.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1adc112204c49811fa193701028d80806a91f87
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/box.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/box__arrow.png b/interface/web/themes/default-v2/icons/x16/box__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..fda5bd79f5bae6d4bdb5d671ce14a1ec5ff77013
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/box__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/box__exclamation.png b/interface/web/themes/default-v2/icons/x16/box__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..80aea4361631655592ac194eb9243ccd2d3d4b82
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/box__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/box__minus.png b/interface/web/themes/default-v2/icons/x16/box__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8fae8526f8158e96620e31ca233e9a368dd5b96
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/box__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/box__pencil.png b/interface/web/themes/default-v2/icons/x16/box__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..9652a2c048814b5728c19fbfeb8b6ddfa7a62aea
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/box__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/box__plus.png b/interface/web/themes/default-v2/icons/x16/box__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8c4f9a0099d2538bfdc2b1a40cc40a88f14d2f9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/box__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/box_label.png b/interface/web/themes/default-v2/icons/x16/box_label.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6da8f8b3bb2bfe605dcfc0e352dc0a99170ff3b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/box_label.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase.png b/interface/web/themes/default-v2/icons/x16/briefcase.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d3ffca1afdcd28003edc59a2027a7171cd13289
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/briefcase.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase_arrow.png b/interface/web/themes/default-v2/icons/x16/briefcase_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b4927f6468c9bf80a3a0d803febaed8ae41720c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/briefcase_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase_exclamation.png b/interface/web/themes/default-v2/icons/x16/briefcase_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..19e31d79d34fc5604a15357a5ae7cb7923f36163
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/briefcase_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase_minus.png b/interface/web/themes/default-v2/icons/x16/briefcase_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..f84335b9aa5738c94f983f5c734d14df9cef5b2d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/briefcase_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase_pencil.png b/interface/web/themes/default-v2/icons/x16/briefcase_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..67e66ca2e51024f2fafd66fea1454074c674a705
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/briefcase_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/briefcase_plus.png b/interface/web/themes/default-v2/icons/x16/briefcase_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..24e67f9f328d6b8bf703bb0aaf2c8d39d4cd82ec
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/briefcase_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom.png b/interface/web/themes/default-v2/icons/x16/broom.png
new file mode 100644
index 0000000000000000000000000000000000000000..97daf85a9d9a7e3760d81c17e12aa267ecd2ab3c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/broom.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom_arrow.png b/interface/web/themes/default-v2/icons/x16/broom_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..574f7b14f520e5b4cd72f3c963f6bd95ba0cc061
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/broom_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom_exclamation.png b/interface/web/themes/default-v2/icons/x16/broom_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c355f8ac25b870deb3761fa1207280b46232651
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/broom_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom_minus.png b/interface/web/themes/default-v2/icons/x16/broom_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..430cf6492651286aa5a92245dbed54f6d58cebdc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/broom_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom_pencil.png b/interface/web/themes/default-v2/icons/x16/broom_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..97c90cf67f7404f3d929f95d84082596d10e31d7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/broom_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/broom_plus.png b/interface/web/themes/default-v2/icons/x16/broom_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..402e0e8376d40b5442b2c5772b864ff1c110497b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/broom_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator.png b/interface/web/themes/default-v2/icons/x16/calculator.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1782c97f6ac5b7ab0eba7f9ee5e95c3a9c3ab26
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calculator.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator_arrow.png b/interface/web/themes/default-v2/icons/x16/calculator_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..184f01693af878a46c845ee5c1e9ddbb5e2a74e7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calculator_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator_exclamation.png b/interface/web/themes/default-v2/icons/x16/calculator_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..2468be504c46ba27467ed62e2e535d05f5e224dc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calculator_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator_minus.png b/interface/web/themes/default-v2/icons/x16/calculator_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3c8b40714b4a3150c83d3e513b35952de8e3cff
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calculator_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator_pencil.png b/interface/web/themes/default-v2/icons/x16/calculator_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3665e9af67399dc079db38c25adcffa8421ec5e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calculator_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calculator_plus.png b/interface/web/themes/default-v2/icons/x16/calculator_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c833693ce0631a6ba123241f35b93ed196a788dc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calculator_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar.png b/interface/web/themes/default-v2/icons/x16/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f38cfea75b5fc0031a63543213ad558fe35121e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calendar.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar__arrow.png b/interface/web/themes/default-v2/icons/x16/calendar__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f98abd5996fd701bfea83b11f382202c374fbf23
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calendar__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar__exclamation.png b/interface/web/themes/default-v2/icons/x16/calendar__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..103e9cddbc1564b0775c1657e74b34918aa2cad2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calendar__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar__minus.png b/interface/web/themes/default-v2/icons/x16/calendar__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9a9885e4e790384449f0c7bb5d47e4d64acab45
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calendar__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar__pencil.png b/interface/web/themes/default-v2/icons/x16/calendar__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..946554db6fbe3340a6d52c3cc1fe14539921d610
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calendar__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar__plus.png b/interface/web/themes/default-v2/icons/x16/calendar__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..84dddb8df4932ad74c9a577f8f75236fd142d290
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calendar__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar_day.png b/interface/web/themes/default-v2/icons/x16/calendar_day.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea7f247d49513509dbce68f18dce65c23128005c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calendar_day.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/calendar_month.png b/interface/web/themes/default-v2/icons/x16/calendar_month.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f3d9444a4b76788829d93b374fde550afc256dc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/calendar_month.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera.png b/interface/web/themes/default-v2/icons/x16/camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..a828599892892978cfdb8cfbb866d4a96d2cd368
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/camera.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera__arrow.png b/interface/web/themes/default-v2/icons/x16/camera__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..61c488d0b43991ff372c2177ba7ed26084ff2052
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/camera__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera__exclamation.png b/interface/web/themes/default-v2/icons/x16/camera__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ba77c5f01347457684f63980acedb46cb43514a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/camera__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera__minus.png b/interface/web/themes/default-v2/icons/x16/camera__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed506c6c3f01809a785059cad557434fb7d8aa63
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/camera__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera__pencil.png b/interface/web/themes/default-v2/icons/x16/camera__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..0611e47de4af5374a372017790f8b9444033d744
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/camera__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera__plus.png b/interface/web/themes/default-v2/icons/x16/camera__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3ba46afa818de3db3ece6b439dc24df37668825
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/camera__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera_black.png b/interface/web/themes/default-v2/icons/x16/camera_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d7c826035481345f690692d55fd8c02015324ae
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/camera_black.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera_small.png b/interface/web/themes/default-v2/icons/x16/camera_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..af9fb75563b9ffe547b7a98bd41e19500e75742f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/camera_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/camera_small_black.png b/interface/web/themes/default-v2/icons/x16/camera_small_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8ba67ec7d4cfc5851d9754a783b74a2b7d21ce4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/camera_small_black.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/card.png b/interface/web/themes/default-v2/icons/x16/card.png
new file mode 100644
index 0000000000000000000000000000000000000000..243caab12b8b0e2d888f8a83f4e7ab63d49eddbf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/card.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/card__arrow.png b/interface/web/themes/default-v2/icons/x16/card__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f97d856ac759eb848ad8c9a180c8d89bb0683442
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/card__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/card__exclamation.png b/interface/web/themes/default-v2/icons/x16/card__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d51346b7030ff0c9eeaecf7a6e1894528b4773e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/card__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/card__minus.png b/interface/web/themes/default-v2/icons/x16/card__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6711e6f3423a7d0adee9ef5dd63e1a32ab8a6ab6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/card__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/card__pencil.png b/interface/web/themes/default-v2/icons/x16/card__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a2ab2063926f4ba57339798aa718915ddae01bd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/card__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/card__plus.png b/interface/web/themes/default-v2/icons/x16/card__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..817995bee67a8a9b83da434234b8dddb1824beca
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/card__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/card_address.png b/interface/web/themes/default-v2/icons/x16/card_address.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ab99a1df71ab474db687e7a69bf554bf9578b0a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/card_address.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/card_small.png b/interface/web/themes/default-v2/icons/x16/card_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..a122163ab5d7b30c18b5b97496d1af6de1522025
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/card_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards.png b/interface/web/themes/default-v2/icons/x16/cards.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb20f4a730d2be328f13cd36f91044b1e650f45d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cards.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards__arrow.png b/interface/web/themes/default-v2/icons/x16/cards__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..10015f291074a908d1e50078a7b711af28073abd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cards__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards__exclamation.png b/interface/web/themes/default-v2/icons/x16/cards__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..add6f0dc8231d02fb70bddd17a034cff4d7ba138
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cards__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards__minus.png b/interface/web/themes/default-v2/icons/x16/cards__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9188b272147972f5562b178383dc80146006e53
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cards__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards__pencil.png b/interface/web/themes/default-v2/icons/x16/cards__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..b160038b34a3084aee1d0aaa313dc3f8f97a927d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cards__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards__plus.png b/interface/web/themes/default-v2/icons/x16/cards__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d078c6bf1610aa92fc83a7968233b5f007a2f140
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cards__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards_address.png b/interface/web/themes/default-v2/icons/x16/cards_address.png
new file mode 100644
index 0000000000000000000000000000000000000000..f76d171dc627580fbe609f1eff7b931a64ad2df3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cards_address.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cards_stack.png b/interface/web/themes/default-v2/icons/x16/cards_stack.png
new file mode 100644
index 0000000000000000000000000000000000000000..51972d8325f477bd55d71c53097f8507b299b6ef
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cards_stack.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette.png b/interface/web/themes/default-v2/icons/x16/cassette.png
new file mode 100644
index 0000000000000000000000000000000000000000..54cdfe3afdcc61f9814fb907715355941e2e017c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cassette.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_arrow.png b/interface/web/themes/default-v2/icons/x16/cassette_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..48c7cda85969691490b8bfc608e9c35786bb5013
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cassette_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_exclamation.png b/interface/web/themes/default-v2/icons/x16/cassette_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2befbf31cf5d1dfea8b8421c81321a8ed9aadad
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cassette_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_minus.png b/interface/web/themes/default-v2/icons/x16/cassette_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..60ab78a95f8bfb15c245e83d2e00c71f312422f9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cassette_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_pencil.png b/interface/web/themes/default-v2/icons/x16/cassette_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..b226e3c22c42e8166542bbe19719d057a5801dc2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cassette_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_plus.png b/interface/web/themes/default-v2/icons/x16/cassette_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..9669097a48686d4446ef7d3bac7b01dea6fe1544
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cassette_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cassette_small.png b/interface/web/themes/default-v2/icons/x16/cassette_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ac8072deea91b24d65b414d6e1bebb489c9c965
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cassette_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain.png b/interface/web/themes/default-v2/icons/x16/chain.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c93b294d3bfa760a122847b5419a9f4e5f90199
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/chain.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_arrow.png b/interface/web/themes/default-v2/icons/x16/chain_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0d7642cc9fda3e2de4a7d45883738feecb2ef05
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/chain_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_exclamation.png b/interface/web/themes/default-v2/icons/x16/chain_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..74f3277acc50d597440202cb4b408d06efae233a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/chain_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_minus.png b/interface/web/themes/default-v2/icons/x16/chain_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..67483b8c0d0742302f31b91fd5455ff482e1f226
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/chain_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_pencil.png b/interface/web/themes/default-v2/icons/x16/chain_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..e68278d836adaf26ac94db94d940e8dc5994320a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/chain_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_plus.png b/interface/web/themes/default-v2/icons/x16/chain_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..99a48ac4d9852f750002ff14b1efda3c1f4146ff
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/chain_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_small.png b/interface/web/themes/default-v2/icons/x16/chain_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4f1b114c4562dfea7a4e964b503f70837d89de9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/chain_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/chain_unchain.png b/interface/web/themes/default-v2/icons/x16/chain_unchain.png
new file mode 100644
index 0000000000000000000000000000000000000000..8decfb022854b09877b7a7e475d66c1a8bf75110
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/chain_unchain.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard.png b/interface/web/themes/default-v2/icons/x16/clipboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..24c1528a8790e1c583e1bbdb7a19690e3c1614f0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clipboard.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard__arrow.png b/interface/web/themes/default-v2/icons/x16/clipboard__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..2380ab60dd7d866c15b94935e752ec8406b6e299
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clipboard__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard__exclamation.png b/interface/web/themes/default-v2/icons/x16/clipboard__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd8b682e3555a377b2f994c83f3d0219f0b6a536
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clipboard__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard__minus.png b/interface/web/themes/default-v2/icons/x16/clipboard__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1536eb527f0f285ac4628fe06f01908666ad136
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clipboard__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard__pencil.png b/interface/web/themes/default-v2/icons/x16/clipboard__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..efce1c43b3348caba895b23ea4ded20035ec478c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clipboard__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard__plus.png b/interface/web/themes/default-v2/icons/x16/clipboard__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..05fc5ea9df5e9fc5c54095c371768ab868ab29b4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clipboard__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard_empty.png b/interface/web/themes/default-v2/icons/x16/clipboard_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1d8414a7fc5afca4e466d49cda574b29773db8f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clipboard_empty.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clipboard_text.png b/interface/web/themes/default-v2/icons/x16/clipboard_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..31bece5efc2d713996478e1dd43fa103f9b143cf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clipboard_text.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock.png b/interface/web/themes/default-v2/icons/x16/clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b6c96efb3ed660de52a8df8293062368ea5e08c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clock.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock__arrow.png b/interface/web/themes/default-v2/icons/x16/clock__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6b7e07303ae01ca6ebfeb654f56a96be4e1e7fe
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clock__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock__exclamation.png b/interface/web/themes/default-v2/icons/x16/clock__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ab75f41857700dfeab1b535913c22719ec85da3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clock__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock__minus.png b/interface/web/themes/default-v2/icons/x16/clock__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..28af166fd8a0b0a28b0caff95109bc441538b2b1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clock__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock__pencil.png b/interface/web/themes/default-v2/icons/x16/clock__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d04f2ed5c6cbad2ccaabc67b81b5109a817c78f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clock__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock__plus.png b/interface/web/themes/default-v2/icons/x16/clock__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a6934e0df8535cbb810e13edefda40109859a70
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clock__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock_fill.png b/interface/web/themes/default-v2/icons/x16/clock_fill.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8bbfc23801c658600224b03e3fa64fdc2abfe4d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clock_fill.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock_frame.png b/interface/web/themes/default-v2/icons/x16/clock_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7c00ea9dff148b15e68a00d17d356776ec38ae0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clock_frame.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/clock_small.png b/interface/web/themes/default-v2/icons/x16/clock_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..b17fe52fa6375fd33585896effc94fa95ee0cbf7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/clock_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/color.png b/interface/web/themes/default-v2/icons/x16/color.png
new file mode 100644
index 0000000000000000000000000000000000000000..49b31c2a8b62c04a80c2b7f915f48da8c04749a7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/color.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_arrow.png b/interface/web/themes/default-v2/icons/x16/color_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..bec3b4b7fd536b5de72eb96814a712b4cd7b06c3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/color_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_exclamation.png b/interface/web/themes/default-v2/icons/x16/color_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..56f2715affbcac373933df82a23356addc95501d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/color_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_minus.png b/interface/web/themes/default-v2/icons/x16/color_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0299cd5cc92550d022fc3f1a3f8aeae656edbb8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/color_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_pencil.png b/interface/web/themes/default-v2/icons/x16/color_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..56f00c931d65bc282e4f1f9b1bbe5fb17aece99c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/color_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_plus.png b/interface/web/themes/default-v2/icons/x16/color_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..23b3e9c32a6e3e7b2a26f282952dd31ff52ab908
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/color_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/color_small.png b/interface/web/themes/default-v2/icons/x16/color_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..085a9d99156d9ba00b083626ee9ce0cd8905a049
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/color_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast.png b/interface/web/themes/default-v2/icons/x16/contrast.png
new file mode 100644
index 0000000000000000000000000000000000000000..4367274f82954a40c36f4735a30ba786eb91a4c2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/contrast.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast__arrow.png b/interface/web/themes/default-v2/icons/x16/contrast__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad1107bb01f1023fd3da554a20d827fdc1ffdab8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/contrast__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast__exclamation.png b/interface/web/themes/default-v2/icons/x16/contrast__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..2efc34c4a0056ef9a710e2082c10ccde45c88385
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/contrast__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast__minus.png b/interface/web/themes/default-v2/icons/x16/contrast__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c5a17e5ebd096576647c7b7290ed5dfaad84478
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/contrast__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast__pencil.png b/interface/web/themes/default-v2/icons/x16/contrast__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..69e09f7406b38a98b6dc5b7434ac39a05d98e713
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/contrast__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast__plus.png b/interface/web/themes/default-v2/icons/x16/contrast__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ce1789eaf4369fa50f09d17b6f9fae879ba3f3b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/contrast__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast_low.png b/interface/web/themes/default-v2/icons/x16/contrast_low.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b4c2d7e7f241ddc09018fa768d83da262f6314c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/contrast_low.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast_small.png b/interface/web/themes/default-v2/icons/x16/contrast_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..606c490662373013d52901484d9e7a6e3021d777
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/contrast_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/contrast_small_low.png b/interface/web/themes/default-v2/icons/x16/contrast_small_low.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd31a180511bc57e04647c3d9fa299f471ebccf3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/contrast_small_low.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross.png b/interface/web/themes/default-v2/icons/x16/cross.png
new file mode 100644
index 0000000000000000000000000000000000000000..45d6e0d22aa95129d1ef11f92f55d1cc2fde7cad
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cross.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross_circle.png b/interface/web/themes/default-v2/icons/x16/cross_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0886b8ccec4a51c1f59c4e866378ee339907db2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cross_circle.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross_circle_frame.png b/interface/web/themes/default-v2/icons/x16/cross_circle_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..b67b8c90834a973435994ffe66f7098ef3f84711
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cross_circle_frame.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross_shield.png b/interface/web/themes/default-v2/icons/x16/cross_shield.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea75a6fc4bfe6278bd47944ee5d4af475140844d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cross_shield.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross_small.png b/interface/web/themes/default-v2/icons/x16/cross_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..f55e3cf6aef8cc0d5aac7c757308ea2fff0822c9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cross_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/cross_small_circle.png b/interface/web/themes/default-v2/icons/x16/cross_small_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..948ccc36c5e141c36dc0ad9e8b7ff555a17d489c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/cross_small_circle.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown.png b/interface/web/themes/default-v2/icons/x16/crown.png
new file mode 100644
index 0000000000000000000000000000000000000000..d48dd5d9c87304fe6d6c261722341e7324486bdd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/crown.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown__arrow.png b/interface/web/themes/default-v2/icons/x16/crown__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..4185b7c73b4ecb6f18418ee3f2f98355b2768177
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/crown__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown__exclamation.png b/interface/web/themes/default-v2/icons/x16/crown__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..845be0f1a5d6d5fe8d982e8d29d516b262a63783
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/crown__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown__minus.png b/interface/web/themes/default-v2/icons/x16/crown__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddeadb3a1d6aae93ab58c3b3249ca50939507f7a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/crown__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown__pencil.png b/interface/web/themes/default-v2/icons/x16/crown__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ae445f1d0087dad231027561d1ced1567d7367d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/crown__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown__plus.png b/interface/web/themes/default-v2/icons/x16/crown__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..66a13f86943ab7e5b856d71f9e374c4d2ec306e1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/crown__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown_bronze.png b/interface/web/themes/default-v2/icons/x16/crown_bronze.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d0e752bad6eb628870b886790098e9f47bf5303
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/crown_bronze.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/crown_silver.png b/interface/web/themes/default-v2/icons/x16/crown_silver.png
new file mode 100644
index 0000000000000000000000000000000000000000..917987f6f38fb77c7f60c85fc1f301ab2b596ead
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/crown_silver.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/database.png b/interface/web/themes/default-v2/icons/x16/database.png
new file mode 100644
index 0000000000000000000000000000000000000000..a81cfecfad0e853e89f30febc14d22633d0cbe16
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/database.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_arrow.png b/interface/web/themes/default-v2/icons/x16/database_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab07ed078931ced354efe6d94391dc0ad86cea94
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/database_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_exclamation.png b/interface/web/themes/default-v2/icons/x16/database_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..a10c08422bce1b9d3e33860db89575d7cace9c56
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/database_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_minus.png b/interface/web/themes/default-v2/icons/x16/database_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..662af8f4394cb41bd228c51547c5caca03fb1342
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/database_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_pencil.png b/interface/web/themes/default-v2/icons/x16/database_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..21eba868a4a6e48b9cbc34abced0e6ba1d7ea6e3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/database_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_plus.png b/interface/web/themes/default-v2/icons/x16/database_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc67cc49ff289e5d530da93dabc51a13ff5e63db
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/database_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/database_small.png b/interface/web/themes/default-v2/icons/x16/database_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..1919c749805f469ce48acd3ab2aaf16825814aef
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/database_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases.png b/interface/web/themes/default-v2/icons/x16/databases.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cb5e5ff498765f03575c2df6dbba18ee3563c0a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/databases.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases_arrow.png b/interface/web/themes/default-v2/icons/x16/databases_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..23756383c60f7012415723e45346ffdd2845ae56
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/databases_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases_exclamation.png b/interface/web/themes/default-v2/icons/x16/databases_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ddf2e9a6d2f39654410532e1653f7182da527
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/databases_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases_minus.png b/interface/web/themes/default-v2/icons/x16/databases_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfea00a5e831be7b7a506b5c1250c21478188fca
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/databases_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases_pencil.png b/interface/web/themes/default-v2/icons/x16/databases_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..2820b8ba3e14453db5b853c1b8f4589331b40a1f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/databases_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/databases_plus.png b/interface/web/themes/default-v2/icons/x16/databases_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..203dd449501f14c484ca6b6a4c7911c3fb9c13d1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/databases_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc.png b/interface/web/themes/default-v2/icons/x16/disc.png
new file mode 100644
index 0000000000000000000000000000000000000000..46397ad813dd5386831d0a9d83a16c20a88bbbff
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disc.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_arrow.png b/interface/web/themes/default-v2/icons/x16/disc_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..806d24f893f3f31bb24bb655e6cc5051f08910b4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disc_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_exclamation.png b/interface/web/themes/default-v2/icons/x16/disc_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd45b6d86f567966c603522f7af4be07f4269aed
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disc_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_minus.png b/interface/web/themes/default-v2/icons/x16/disc_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee62517738955233bc841c910b9fd8509864ce2c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disc_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_pencil.png b/interface/web/themes/default-v2/icons/x16/disc_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..181ac9fba09035cdf12d535adca0f4b87438f5ba
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disc_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_plus.png b/interface/web/themes/default-v2/icons/x16/disc_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c3a1e07941988ffca8bff2230164b7b0b020ef4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disc_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disc_small.png b/interface/web/themes/default-v2/icons/x16/disc_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..315d294b67917909a5447564af76bd7c549725b9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disc_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs.png b/interface/web/themes/default-v2/icons/x16/discs.png
new file mode 100644
index 0000000000000000000000000000000000000000..4998c22ebd4375817edec712f8938b4d59970449
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/discs.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs_arrow.png b/interface/web/themes/default-v2/icons/x16/discs_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..d354855dd5c0fa37fad2782522a2ddae1bc7f667
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/discs_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs_exclamation.png b/interface/web/themes/default-v2/icons/x16/discs_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f63b48ec74fb12d1a6e8089e3e564ef2a122387
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/discs_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs_minus.png b/interface/web/themes/default-v2/icons/x16/discs_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..196b18c8959c73b3f21a368730541d3282435693
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/discs_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs_pencil.png b/interface/web/themes/default-v2/icons/x16/discs_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c965e4f0680f0614e8deba5959b852c40a732dc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/discs_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/discs_plus.png b/interface/web/themes/default-v2/icons/x16/discs_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..281acb09e434b02e6597f0499fdbd7f252681020
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/discs_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk.png b/interface/web/themes/default-v2/icons/x16/disk.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3827760bdd28095ba0fd60a126fd8bfb7c42afd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disk.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk__arrow.png b/interface/web/themes/default-v2/icons/x16/disk__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..c364501e9cebb82549b737cd340056fdad57b52b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disk__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk__exclamation.png b/interface/web/themes/default-v2/icons/x16/disk__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c6d4c9f2200a73ae345f14de22fee2e32496c53
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disk__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk__minus.png b/interface/web/themes/default-v2/icons/x16/disk__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..41993a4f4799c33967374afd07226375873cf15f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disk__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk__pencil.png b/interface/web/themes/default-v2/icons/x16/disk__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..39b929bcb5f65c3b45607429ddabdf03dbd6b4eb
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disk__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk__plus.png b/interface/web/themes/default-v2/icons/x16/disk__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..de62ee17d39ddd9ccad17614161fdbc20e9c26e9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disk__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk_black.png b/interface/web/themes/default-v2/icons/x16/disk_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..a08f6f13d4662c73a47b1b984c8b7d14cf33e69c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disk_black.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk_small.png b/interface/web/themes/default-v2/icons/x16/disk_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..3444cbf0d5afb03f685b6389b057ba87445bccc2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disk_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disk_small_black.png b/interface/web/themes/default-v2/icons/x16/disk_small_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d992ad88a327fd32a5f0c0737777ec03acef919
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disk_small_black.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks.png b/interface/web/themes/default-v2/icons/x16/disks.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f2a9801142554e4ad2a858e6e4080558c231931
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disks.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks__arrow.png b/interface/web/themes/default-v2/icons/x16/disks__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bd0a71c4f1915f0c1f0fcc247fa2c4e3d9c9404
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disks__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks__exclamation.png b/interface/web/themes/default-v2/icons/x16/disks__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4606873416febe49d31c6e3eed7c506e00e3a929
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disks__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks__minus.png b/interface/web/themes/default-v2/icons/x16/disks__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..764000c0b2e1b3f9b9d97b46f62cb08e37a0f4fd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disks__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks__pencil.png b/interface/web/themes/default-v2/icons/x16/disks__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..a627c311204a6a4c4bb7c6189021be7b48efc860
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disks__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks__plus.png b/interface/web/themes/default-v2/icons/x16/disks__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..80ec32d79f10eca27ad2e4550b67a6778d2ea3da
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disks__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/disks_black.png b/interface/web/themes/default-v2/icons/x16/disks_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..646bb4e3894dc3ed2a09b93bda59faf9e735f2f2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/disks_black.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document.png b/interface/web/themes/default-v2/icons/x16/document.png
new file mode 100644
index 0000000000000000000000000000000000000000..b84a5cd0c9867e09cc88b5f0cd0f3e62a450f564
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document__arrow.png b/interface/web/themes/default-v2/icons/x16/document__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..501197f7e40e9d75861537824bc0917bc07de833
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document__exclamation.png b/interface/web/themes/default-v2/icons/x16/document__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc9187aae6cbcfdbe80ca693aa11ed3276a8791e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document__minus.png b/interface/web/themes/default-v2/icons/x16/document__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f900ea2e94e8fbb993d2431e04e7c3d79264cfe
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document__pencil.png b/interface/web/themes/default-v2/icons/x16/document__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..eddc6ce52824867cbb4200068a4389c5e7bcd036
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document__plus.png b/interface/web/themes/default-v2/icons/x16/document__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b61978ae9287abc0db00d1dffc7774428d0069db
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_horizontal.png b/interface/web/themes/default-v2/icons/x16/document_horizontal.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c133e878e5b28cd44dee3149194d2b4d7c7fc5f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document_horizontal.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_horizontal_text.png b/interface/web/themes/default-v2/icons/x16/document_horizontal_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ee38d8ebee7ed8b8fe2501e56afb8c177738c2a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document_horizontal_text.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_music.png b/interface/web/themes/default-v2/icons/x16/document_music.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b76eef909371e112a301432924caceaeffbe13b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document_music.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_music_playlist.png b/interface/web/themes/default-v2/icons/x16/document_music_playlist.png
new file mode 100644
index 0000000000000000000000000000000000000000..2708c7f5dfd724eea0d65f942f3783be277cfd99
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document_music_playlist.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_shred.png b/interface/web/themes/default-v2/icons/x16/document_shred.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c0d00c261c3b0f5d5dd86c702b9a1af89f10fdd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document_shred.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_small.png b/interface/web/themes/default-v2/icons/x16/document_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e7ce8c8622d993c2c7ac0af9849882b66ee51de
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_text.png b/interface/web/themes/default-v2/icons/x16/document_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..48cdf7551bf9c4dddcfb4ee874cb864212a9dc51
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document_text.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_text_image.png b/interface/web/themes/default-v2/icons/x16/document_text_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c697bb30faca5effa81887c4b299ccc41acd9c3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document_text_image.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/document_zipper.png b/interface/web/themes/default-v2/icons/x16/document_zipper.png
new file mode 100644
index 0000000000000000000000000000000000000000..add627c2543f1b8897f97e437fa0fea324a9bc5f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/document_zipper.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents.png b/interface/web/themes/default-v2/icons/x16/documents.png
new file mode 100644
index 0000000000000000000000000000000000000000..0aa748455e6818c34af690871c6c4c1688422f38
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/documents.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_arrow.png b/interface/web/themes/default-v2/icons/x16/documents_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e7a46a5a0a68809522ddea4b2578d9222b11335
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/documents_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_exclamation.png b/interface/web/themes/default-v2/icons/x16/documents_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..20b9169a15e588c8ba4cab2faf4bf80522fdb1e9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/documents_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_minus.png b/interface/web/themes/default-v2/icons/x16/documents_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c8042dcf60e8484bb15032da2cbbe2f0de1e702
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/documents_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_pencil.png b/interface/web/themes/default-v2/icons/x16/documents_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddc0b7d6b19f988aa4aef8e496e0ba58d04f802c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/documents_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_plus.png b/interface/web/themes/default-v2/icons/x16/documents_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d09545372a817edc6f02cba25792e9fd03671146
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/documents_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_stack.png b/interface/web/themes/default-v2/icons/x16/documents_stack.png
new file mode 100644
index 0000000000000000000000000000000000000000..21e3f4d1cad3c96126670632a37531f534baa9f9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/documents_stack.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/documents_text.png b/interface/web/themes/default-v2/icons/x16/documents_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6f5833275c3a4c8ed3eb5e60324371bf495f740
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/documents_text.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/door.png b/interface/web/themes/default-v2/icons/x16/door.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b7c1bc63a77806b3a7bf4dc963bda49c0a27dd1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/door.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/door_arrow.png b/interface/web/themes/default-v2/icons/x16/door_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..efabfc908b8efcacd0735b6c9c5546946e42f940
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/door_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/door_exclamation.png b/interface/web/themes/default-v2/icons/x16/door_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fb609c2d6bf4b511de7058ae3dd0d3571dfd52d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/door_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/door_minus.png b/interface/web/themes/default-v2/icons/x16/door_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..7356d39e49539ea48595cf8c1e3fb20c5ab6743b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/door_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/door_pencil.png b/interface/web/themes/default-v2/icons/x16/door_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e245e00b19f23099f32f7be52a1c75b02dfcae7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/door_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/door_plus.png b/interface/web/themes/default-v2/icons/x16/door_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..302a1f9bf36608fc5529306202093986c84946fc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/door_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer.png b/interface/web/themes/default-v2/icons/x16/drawer.png
new file mode 100644
index 0000000000000000000000000000000000000000..50c57378c8cd0e0d8ef615bf5da45a198b45c342
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drawer.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer_arrow.png b/interface/web/themes/default-v2/icons/x16/drawer_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4a707503d76ae468188023a2cc433d481c406b9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drawer_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer_exclamation.png b/interface/web/themes/default-v2/icons/x16/drawer_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..03f0c1eefb72392ced1d10249b396dfd42135dfd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drawer_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer_minus.png b/interface/web/themes/default-v2/icons/x16/drawer_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e2ff66c9e3510646debb801a0b00a4cdb787760
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drawer_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer_pencil.png b/interface/web/themes/default-v2/icons/x16/drawer_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef7ed0ef506f0d2ca535c13a8aa031cf6650669b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drawer_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drawer_plus.png b/interface/web/themes/default-v2/icons/x16/drawer_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a63fb3ba4b95dcb445de9576b6b1412700021ff3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drawer_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill.png b/interface/web/themes/default-v2/icons/x16/drill.png
new file mode 100644
index 0000000000000000000000000000000000000000..c05a3051ed0941ad4e2a9d8c5d1d734762107405
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drill.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill_arrow.png b/interface/web/themes/default-v2/icons/x16/drill_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdb0737114a34912a1325fd6fa0697772d7bea6a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drill_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill_exclamation.png b/interface/web/themes/default-v2/icons/x16/drill_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9b4a4a46d3cd8eb7425fddd517a716a2e9d7e40
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drill_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill_minus.png b/interface/web/themes/default-v2/icons/x16/drill_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd63de2b44ffa4bafca4db0b96845f1b70588bc5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drill_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill_pencil.png b/interface/web/themes/default-v2/icons/x16/drill_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc0448bb4aa186c15f7ddf1b7cb2ee9063f35de4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drill_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/drill_plus.png b/interface/web/themes/default-v2/icons/x16/drill_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9e751ca6a4e8b0ea6346e545ac54cb80f5b85b5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/drill_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope.png b/interface/web/themes/default-v2/icons/x16/envelope.png
new file mode 100644
index 0000000000000000000000000000000000000000..b13127e8695b0e3bc7ad10e7973b73d7fd79314c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/envelope.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope_arrow.png b/interface/web/themes/default-v2/icons/x16/envelope_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..8024339503892d87b314adb2daed47080504f96c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/envelope_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope_exclamation.png b/interface/web/themes/default-v2/icons/x16/envelope_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..36a43a4909f5073de684a97cb49522fee50181ad
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/envelope_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope_minus.png b/interface/web/themes/default-v2/icons/x16/envelope_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..34003fb51e17ea6139debdb28a131f4ae4bdb06a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/envelope_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope_pencil.png b/interface/web/themes/default-v2/icons/x16/envelope_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..8057d8d35b7f54c67a21e1c8af2f270f62142a15
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/envelope_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/envelope_plus.png b/interface/web/themes/default-v2/icons/x16/envelope_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1062723164bfafc24d712de8d1ab4bec9f05fdf0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/envelope_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer.png b/interface/web/themes/default-v2/icons/x16/equalizer.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc17e8339c389941615eef01bd914f43dc4c61c4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/equalizer.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer_arrow.png b/interface/web/themes/default-v2/icons/x16/equalizer_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..2919dfd0826e2172427d018a6ad7d4f5113397dc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/equalizer_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer_exclamation.png b/interface/web/themes/default-v2/icons/x16/equalizer_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..46b11ab46a352867a69c2d27d4c3c510dd524380
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/equalizer_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer_minus.png b/interface/web/themes/default-v2/icons/x16/equalizer_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e862afe46ab431887a39ea8714c66e428e76b58
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/equalizer_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer_pencil.png b/interface/web/themes/default-v2/icons/x16/equalizer_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..88d6a9937e4e9d21c55db6ae9ee854aa6c6eb6f7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/equalizer_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/equalizer_plus.png b/interface/web/themes/default-v2/icons/x16/equalizer_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5138e71afd403d3d9f9460f3ff9a7a3203ad1061
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/equalizer_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser.png b/interface/web/themes/default-v2/icons/x16/eraser.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ffba3dd4b36701d68cf33badcf5f233f1fc7617
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/eraser.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser_arrow.png b/interface/web/themes/default-v2/icons/x16/eraser_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..7479dc31ff2fc1cf8cc2669932a1e18005dd13dd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/eraser_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser_exclamation.png b/interface/web/themes/default-v2/icons/x16/eraser_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..51bafd9b4c9869ff55469b70a4aa7bb86a9c4f16
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/eraser_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser_minus.png b/interface/web/themes/default-v2/icons/x16/eraser_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4fbf24f596a2b628539cb506532b9ffe56d2b9f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/eraser_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser_pencil.png b/interface/web/themes/default-v2/icons/x16/eraser_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c18f9d72df358b7bc72b0931d89aa5c2e21ffc5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/eraser_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/eraser_plus.png b/interface/web/themes/default-v2/icons/x16/eraser_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7b3f1c5e1ecfaf21bb1edfbdb99916d138a3ffd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/eraser_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/exclamation.png b/interface/web/themes/default-v2/icons/x16/exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..f37eb958203d45839b176190b2c07d1178704421
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/exclamation_frame.png b/interface/web/themes/default-v2/icons/x16/exclamation_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..db1b763d86d274a15931ee8f9953d30c59bed2aa
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/exclamation_frame.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/exclamation_shield.png b/interface/web/themes/default-v2/icons/x16/exclamation_shield.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5fb107ee5ae5a705f8b118c6e71248dab8e452b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/exclamation_shield.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/exclamation_small.png b/interface/web/themes/default-v2/icons/x16/exclamation_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8a05685975b26d95d53646bf16c6188b7c58cf0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/exclamation_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed.png b/interface/web/themes/default-v2/icons/x16/feed.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e5327bbb474ce30bcdc1305781ec839e14ca7f9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/feed.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed__arrow.png b/interface/web/themes/default-v2/icons/x16/feed__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..24fdb9193e60a7cd7380387476526a7399f73439
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/feed__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed__exclamation.png b/interface/web/themes/default-v2/icons/x16/feed__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a5a1a49ed9f05e4c89feed68eca70380e4f904b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/feed__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed__minus.png b/interface/web/themes/default-v2/icons/x16/feed__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfa82aaad7fe6e4211e3191f75a4e73e10f82eba
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/feed__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed__pencil.png b/interface/web/themes/default-v2/icons/x16/feed__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..48587c8f8cbb353e1c8d637f98c8292e688c81b1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/feed__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed__plus.png b/interface/web/themes/default-v2/icons/x16/feed__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb6db9b11a719bd0c3d6f4b4498b8f51f58a843e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/feed__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed_balloon.png b/interface/web/themes/default-v2/icons/x16/feed_balloon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9c94756a18d1ad580fba4e72829e8bcc7239ad9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/feed_balloon.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/feed_small.png b/interface/web/themes/default-v2/icons/x16/feed_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..184a29e54cc36492caf7caf4b518c5b8c2ebaf61
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/feed_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/film.png b/interface/web/themes/default-v2/icons/x16/film.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8b4b5c95a33da87618c3dbacc75eb163347970f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/film.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_arrow.png b/interface/web/themes/default-v2/icons/x16/film_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b256a8b8561553f7cefcecfe1ca15379d79d442
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/film_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_exclamation.png b/interface/web/themes/default-v2/icons/x16/film_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..371e74b06e10ca5c8d399063e14dd79d7a09d36a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/film_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_minus.png b/interface/web/themes/default-v2/icons/x16/film_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0c58e1abd2000b56b2e966e1654782294296a2c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/film_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_pencil.png b/interface/web/themes/default-v2/icons/x16/film_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..a45ab17347b403f8ad79e83dfd093d6bc8519ab0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/film_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_plus.png b/interface/web/themes/default-v2/icons/x16/film_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e41b830996d7b9bce031e93109cde22154cc957
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/film_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/film_small.png b/interface/web/themes/default-v2/icons/x16/film_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..311335dd8f51eaa11ab6288dcbdc73f869f810f7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/film_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/films.png b/interface/web/themes/default-v2/icons/x16/films.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ca32682411ad922fd5831e34468520c1cd2c39a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/films.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/films_arrow.png b/interface/web/themes/default-v2/icons/x16/films_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd136bbdba12f063a6743600fbc281f58e39f57a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/films_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/films_exclamation.png b/interface/web/themes/default-v2/icons/x16/films_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..6aef39eab5510857ddc5f190caf8ba6afe9b4217
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/films_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/films_minus.png b/interface/web/themes/default-v2/icons/x16/films_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b570dce43c337e7e2d875a8d10807a8437e1eac1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/films_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/films_pencil.png b/interface/web/themes/default-v2/icons/x16/films_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..03ab1bd2e0191509c47b22a38a0532c100c3999f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/films_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/films_plus.png b/interface/web/themes/default-v2/icons/x16/films_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bf37576ff8e49123ced7cef000920f38481ad36
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/films_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag.png b/interface/web/themes/default-v2/icons/x16/flag.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d0a6ae0be887bdde4b7bb0fb453acc2decff2f2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/flag.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag_arrow.png b/interface/web/themes/default-v2/icons/x16/flag_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..06e94a8776270e9f23401892f911fb96ad098538
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/flag_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag_exclamation.png b/interface/web/themes/default-v2/icons/x16/flag_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..18a242fc040d605e843fc871aa9096ff8be2fe0b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/flag_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag_minus.png b/interface/web/themes/default-v2/icons/x16/flag_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e00958a5aa6d415d5e24cb27d159af76ef19e26d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/flag_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag_pencil.png b/interface/web/themes/default-v2/icons/x16/flag_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d2c67a32660d824ddd75fc784a9638669be42d7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/flag_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/flag_plus.png b/interface/web/themes/default-v2/icons/x16/flag_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..560a99523420b6ef4e5753b9342b2aea2b67de2e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/flag_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder.png b/interface/web/themes/default-v2/icons/x16/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..08dbc875641c0f02557d1025c1916c3484ba9f54
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder__arrow.png b/interface/web/themes/default-v2/icons/x16/folder__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ada7b23ece60581afe13de082b7451098459e7bd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder__exclamation.png b/interface/web/themes/default-v2/icons/x16/folder__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce288bc15145e4784fe508c40a40a7f13f25b555
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder__minus.png b/interface/web/themes/default-v2/icons/x16/folder__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f7b0fdf74975f12e6236f8cfa4af0ae5693d0c6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder__pencil.png b/interface/web/themes/default-v2/icons/x16/folder__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f974e1c3d836779df9e4f9ce8894da216fa19b2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder__plus.png b/interface/web/themes/default-v2/icons/x16/folder__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..152eecbbb856cd947c968744aa705e78ba69cb61
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open.png b/interface/web/themes/default-v2/icons/x16/folder_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..06452a8e747536953f66aba41f92409ed5c38a8f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder_open.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_document.png b/interface/web/themes/default-v2/icons/x16/folder_open_document.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3224d33d5e7dccd2eae74d555a90ba1cf4caa5d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder_open_document.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_document_music.png b/interface/web/themes/default-v2/icons/x16/folder_open_document_music.png
new file mode 100644
index 0000000000000000000000000000000000000000..855299c23f21445ee6256032fab70db97dc545d4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder_open_document_music.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_document_music_playlist.png b/interface/web/themes/default-v2/icons/x16/folder_open_document_music_playlist.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2f17c32b0825334ca49ace3b8fc2029eaa6a5d1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder_open_document_music_playlist.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_document_text.png b/interface/web/themes/default-v2/icons/x16/folder_open_document_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..5599a35d8ec93aeb789382e383a66e35b89b890e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder_open_document_text.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_film.png b/interface/web/themes/default-v2/icons/x16/folder_open_film.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5b9900d1cf9e737b56b66220b4874238141629a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder_open_film.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_open_image.png b/interface/web/themes/default-v2/icons/x16/folder_open_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eb3967dd20e21bb8421e3b1e2922442199d5ee9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder_open_image.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_shred.png b/interface/web/themes/default-v2/icons/x16/folder_shred.png
new file mode 100644
index 0000000000000000000000000000000000000000..2208550e132e4eaaf6b2e4cefc6e2f8cf78c3dd0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder_shred.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_small.png b/interface/web/themes/default-v2/icons/x16/folder_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f479877b277bbe25a5c3d5263123d5e621fbfd2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folder_zipper.png b/interface/web/themes/default-v2/icons/x16/folder_zipper.png
new file mode 100644
index 0000000000000000000000000000000000000000..874d076fd8a8404c5ce3268c31e464a158ad142f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folder_zipper.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders.png b/interface/web/themes/default-v2/icons/x16/folders.png
new file mode 100644
index 0000000000000000000000000000000000000000..f236e50c5dd18e075f427b6e74c9c59aec157e3b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folders.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_arrow.png b/interface/web/themes/default-v2/icons/x16/folders_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..720b84d47b833c19139035180e26806240cef659
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folders_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_exclamation.png b/interface/web/themes/default-v2/icons/x16/folders_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..c41051fd9255a393166bccb994eb554c3d9f426b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folders_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_minus.png b/interface/web/themes/default-v2/icons/x16/folders_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..435b57b4c96359c60215fd936a1ee314c43ef89e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folders_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_pencil.png b/interface/web/themes/default-v2/icons/x16/folders_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..34007f81b37449fbd2b1c9f790e8fa4d1e1adb25
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folders_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_plus.png b/interface/web/themes/default-v2/icons/x16/folders_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..df1ff71d4b222fd64f10bcd08174c161c6d7b757
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folders_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/folders_stack.png b/interface/web/themes/default-v2/icons/x16/folders_stack.png
new file mode 100644
index 0000000000000000000000000000000000000000..146a8fb4589dc2162b0eaf9eae565e6da7b7e3b0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/folders_stack.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel.png b/interface/web/themes/default-v2/icons/x16/funnel.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebd8b556cfd260133aa84bc00a41e08fde52406f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/funnel.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_arrow.png b/interface/web/themes/default-v2/icons/x16/funnel_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..48589782aeef8f1318670694c77fbdcf84e58049
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/funnel_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_exclamation.png b/interface/web/themes/default-v2/icons/x16/funnel_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..0549c609fa196fd15180f5e62534520fbd4bf0be
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/funnel_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_minus.png b/interface/web/themes/default-v2/icons/x16/funnel_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f446d71217792cc51f254acd8c570dbd0aad8bf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/funnel_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_pencil.png b/interface/web/themes/default-v2/icons/x16/funnel_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c2d9b54516e0b3c3158f29f388ba38f6dbc5680
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/funnel_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_plus.png b/interface/web/themes/default-v2/icons/x16/funnel_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2b772282c2fb51d6bad561ee202c0958c87d7d4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/funnel_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/funnel_small.png b/interface/web/themes/default-v2/icons/x16/funnel_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..f914af50f6356968acf7124975eb6d34da25108b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/funnel_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear.png b/interface/web/themes/default-v2/icons/x16/gear.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ae36d07bb6430b6dcf4a004bcee5d24ef692464
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/gear.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear__arrow.png b/interface/web/themes/default-v2/icons/x16/gear__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..97bcdde2d51196d5a71940be5719ada572890969
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/gear__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear__exclamation.png b/interface/web/themes/default-v2/icons/x16/gear__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fc7db097e22aea9f227250c8ee682c8942f9326
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/gear__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear__minus.png b/interface/web/themes/default-v2/icons/x16/gear__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f5d27111e63f687d3d5052b3ab33d8a95a0e10e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/gear__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear__pencil.png b/interface/web/themes/default-v2/icons/x16/gear__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2906ec07b1090add0018c48254e5630c4d7bef0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/gear__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear__plus.png b/interface/web/themes/default-v2/icons/x16/gear__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a94a6188cd9b71da1720b817526d6eaddb3599bc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/gear__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear_disable.png b/interface/web/themes/default-v2/icons/x16/gear_disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..877a66d6a4c947199334c2b8b2960f48df8d09be
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/gear_disable.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/gear_small.png b/interface/web/themes/default-v2/icons/x16/gear_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0e969098528eb9f0f9185357b2e02a9edfb801b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/gear_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer.png b/interface/web/themes/default-v2/icons/x16/hammer.png
new file mode 100644
index 0000000000000000000000000000000000000000..59558fd41a3b3de49b2b11fd14d9442249d33c01
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/hammer.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer__arrow.png b/interface/web/themes/default-v2/icons/x16/hammer__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..23ee5cfcbf5b48e873b373902e5135e5d156181e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/hammer__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer__exclamation.png b/interface/web/themes/default-v2/icons/x16/hammer__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ad1cf51594b3bf858e2b9e40e7c7dc9f308cbc4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/hammer__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer__minus.png b/interface/web/themes/default-v2/icons/x16/hammer__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..549d90cf1323ed117e219163e53994871b710499
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/hammer__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer__pencil.png b/interface/web/themes/default-v2/icons/x16/hammer__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e7821f55dfa1f24c5a6ffe22779cc79cee02357
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/hammer__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer__plus.png b/interface/web/themes/default-v2/icons/x16/hammer__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..331a83b89df593f2ce8c70fb685d629f39005d58
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/hammer__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer_left.png b/interface/web/themes/default-v2/icons/x16/hammer_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..f44861568c1cd27774a14ded9510ec4e4e1a296a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/hammer_left.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/hammer_screwdriver.png b/interface/web/themes/default-v2/icons/x16/hammer_screwdriver.png
new file mode 100644
index 0000000000000000000000000000000000000000..27877af5c4c42a4f6951cc377203032978d874ac
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/hammer_screwdriver.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart.png b/interface/web/themes/default-v2/icons/x16/heart.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e0f0f7b41183f68897a402995d436e7d6bb1618
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart__arrow.png b/interface/web/themes/default-v2/icons/x16/heart__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..014c3785064ffae4d5c6ceafac9a78835854e9fc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart__exclamation.png b/interface/web/themes/default-v2/icons/x16/heart__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..46ad89f85535ccaee38c41188aa98ccc638b8e3b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart__minus.png b/interface/web/themes/default-v2/icons/x16/heart__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c305c305d538c344818e3b119d271c0d61a382d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart__pencil.png b/interface/web/themes/default-v2/icons/x16/heart__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d37ceefbc39eff1e7bbccaf92ed6f4f7f368bd0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart__plus.png b/interface/web/themes/default-v2/icons/x16/heart__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ecc1a334345a82249cf5b4505c4af16f0db837e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_break.png b/interface/web/themes/default-v2/icons/x16/heart_break.png
new file mode 100644
index 0000000000000000000000000000000000000000..a19bd593f4f5c8d8d49172eddd7427e84e1b93c3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart_break.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_empty.png b/interface/web/themes/default-v2/icons/x16/heart_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb513dc4d53a43bf690d504d4d159c39f7e67516
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart_empty.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_half.png b/interface/web/themes/default-v2/icons/x16/heart_half.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a996b475dfcab6d66e591c9319c5b9980178831
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart_half.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_small.png b/interface/web/themes/default-v2/icons/x16/heart_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2ae66f976401735faa8bdcf42e6bb6a833c4da9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_small_empty.png b/interface/web/themes/default-v2/icons/x16/heart_small_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e0c58b8ec7eb82c3d4a8973d6ac99fc6aa3fe31
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart_small_empty.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/heart_small_half.png b/interface/web/themes/default-v2/icons/x16/heart_small_half.png
new file mode 100644
index 0000000000000000000000000000000000000000..234580f8e27bf5c509a78f9c5b6c2855c4180f56
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/heart_small_half.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/home.png b/interface/web/themes/default-v2/icons/x16/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..242e2501df0efee8b318bf1a069eebd1d24b1c44
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/home.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_arrow.png b/interface/web/themes/default-v2/icons/x16/home_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ea4ae607f918f183856dda67ec0ebd3871b042b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/home_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_exclamation.png b/interface/web/themes/default-v2/icons/x16/home_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..a40d4dc1ee1c1529c029f28b00f4425ab6c5fb72
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/home_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_minus.png b/interface/web/themes/default-v2/icons/x16/home_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..138c898a02f0c36acb99765dec97afbf579f243a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/home_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_pencil.png b/interface/web/themes/default-v2/icons/x16/home_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5602a492837a4f2b4a258df54d62d59cc5507d0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/home_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_plus.png b/interface/web/themes/default-v2/icons/x16/home_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9341e8c5719467ff08f157766241bd4d06c5983
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/home_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/home_small.png b/interface/web/themes/default-v2/icons/x16/home_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..07b9993bdd648b14b853725b6a172cce5f1c2818
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/home_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/image.png b/interface/web/themes/default-v2/icons/x16/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..8de223155b08b68464e316d1100f3fc1fd1db418
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/image.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_arrow.png b/interface/web/themes/default-v2/icons/x16/image_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d4d3c884b83a4508c7cf02934c7e1ac1c648def
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/image_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_exclamation.png b/interface/web/themes/default-v2/icons/x16/image_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ca76146b2a9febd7d9e1924a66cb5f0844d4d78
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/image_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_minus.png b/interface/web/themes/default-v2/icons/x16/image_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5e76b464f22fd8bd4f0401289fbe5307325c3d8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/image_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_pencil.png b/interface/web/themes/default-v2/icons/x16/image_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f276d7e75826e1ddcb72173f780942f06399ff3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/image_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_plus.png b/interface/web/themes/default-v2/icons/x16/image_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..522539d56675245fcd4daf33924a129043a5b812
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/image_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_resize.png b/interface/web/themes/default-v2/icons/x16/image_resize.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed9d5ee99c84dae3d405860107b4c3cf7ac27d6e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/image_resize.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_resize_actual.png b/interface/web/themes/default-v2/icons/x16/image_resize_actual.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c57831d33186f4707a9e943570e0d3c60ef555e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/image_resize_actual.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_small.png b/interface/web/themes/default-v2/icons/x16/image_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3c531aaf342bdbc028135498afaec74646e722a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/image_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_small_sunset.png b/interface/web/themes/default-v2/icons/x16/image_small_sunset.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c09828f0bd3ae8cca54c613d9d670107f89e282
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/image_small_sunset.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/image_sunset.png b/interface/web/themes/default-v2/icons/x16/image_sunset.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d54135b875cea20ad63fca5250be9990a6e5ea5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/image_sunset.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/images.png b/interface/web/themes/default-v2/icons/x16/images.png
new file mode 100644
index 0000000000000000000000000000000000000000..a36d528f38858060f46776069e8de5bd2aab4ea0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/images.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_arrow.png b/interface/web/themes/default-v2/icons/x16/images_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b8a94034c32e228b390df28025b868a93a6a346
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/images_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_exclamation.png b/interface/web/themes/default-v2/icons/x16/images_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e6f454e078d68bd91e97571183799b2a7750974
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/images_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_minus.png b/interface/web/themes/default-v2/icons/x16/images_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..21da574a17fca460deb3d12dbdfd438fa4dabd5a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/images_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_pencil.png b/interface/web/themes/default-v2/icons/x16/images_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..3250b89d2811ef550243c159b4c8b442d92bbce5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/images_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_plus.png b/interface/web/themes/default-v2/icons/x16/images_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fe20dca552af201c6718eba1e9af72046c71d63
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/images_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/images_stack.png b/interface/web/themes/default-v2/icons/x16/images_stack.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe33dccd8da879865e0592b2015e633986344d6a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/images_stack.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox.png b/interface/web/themes/default-v2/icons/x16/inbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..e93b4bae815d07eb5fd454b10402851f837eacde
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/inbox.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox_arrow.png b/interface/web/themes/default-v2/icons/x16/inbox_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cf3d51da1705b2026185def968cf6bb2a655870
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/inbox_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox_exclamation.png b/interface/web/themes/default-v2/icons/x16/inbox_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0e69ffa5e63d90fed701e4cc85dcfe800072c13
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/inbox_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox_minus.png b/interface/web/themes/default-v2/icons/x16/inbox_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c5e0232eb2e5474e5bbaf011dac4437f3542210
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/inbox_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox_pencil.png b/interface/web/themes/default-v2/icons/x16/inbox_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb6f91962fb888a431f7e491735cee4fe7cf54c5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/inbox_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/inbox_plus.png b/interface/web/themes/default-v2/icons/x16/inbox_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ac374579877c18ea550ac186f751f7d02169c17
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/inbox_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/information.png b/interface/web/themes/default-v2/icons/x16/information.png
new file mode 100644
index 0000000000000000000000000000000000000000..17ed83ff28cb6773380582fc33768ca81573b418
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/information.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/information_frame.png b/interface/web/themes/default-v2/icons/x16/information_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..33da5b58af802e60a0ffdaf21aafe764ede7caaf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/information_frame.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/information_shield.png b/interface/web/themes/default-v2/icons/x16/information_shield.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad5f1092c8f714c694b58a4cd38d4b9c7bfc9c5b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/information_shield.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/information_small.png b/interface/web/themes/default-v2/icons/x16/information_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5b7e49cad5c34236d7cc2ebe7348821ba742773
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/information_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/key.png b/interface/web/themes/default-v2/icons/x16/key.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd3ed88fbd664c734cc83911452837a5478a36b6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/key.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/key__arrow.png b/interface/web/themes/default-v2/icons/x16/key__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9712f11cd0e8120b2ce39246c3a20d90dcb8c25
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/key__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/key__exclamation.png b/interface/web/themes/default-v2/icons/x16/key__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c9a6741bb89af129fb51d487333defe6d181c57
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/key__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/key__minus.png b/interface/web/themes/default-v2/icons/x16/key__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..f381899e56a9efcdf569cfd1b31304b8737cd5f2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/key__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/key__pencil.png b/interface/web/themes/default-v2/icons/x16/key__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..13774d4912f199d955deadacccdb8959a16d8fc8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/key__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/key__plus.png b/interface/web/themes/default-v2/icons/x16/key__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e3fe414526fffa10cf1dc32c1cb85784435e525
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/key__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/key_disable.png b/interface/web/themes/default-v2/icons/x16/key_disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..72bc9f40a0bfb75a065efdcae367c6512ebed10c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/key_disable.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout.png b/interface/web/themes/default-v2/icons/x16/layout.png
new file mode 100644
index 0000000000000000000000000000000000000000..001a60af262f19206f427fb3672b44a480972abf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_2.png b/interface/web/themes/default-v2/icons/x16/layout_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..41266b2aa2ae3989b68667904e68723e50d43c16
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_2.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_2_equal.png b/interface/web/themes/default-v2/icons/x16/layout_2_equal.png
new file mode 100644
index 0000000000000000000000000000000000000000..695916fc8ee48341a527c802cb68fc5a4ad774c9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_2_equal.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_3.png b/interface/web/themes/default-v2/icons/x16/layout_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e8ab93b4f022116af971cd3bcefa5cfb7796027
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_3.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_3_mix.png b/interface/web/themes/default-v2/icons/x16/layout_3_mix.png
new file mode 100644
index 0000000000000000000000000000000000000000..89fb017e5d75c36620260f08cbf7c29a67cc0b87
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_3_mix.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header.png b/interface/web/themes/default-v2/icons/x16/layout_header.png
new file mode 100644
index 0000000000000000000000000000000000000000..efb95a3d6d4bb057b4c4a637193a0195f280c772
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_header.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_2.png b/interface/web/themes/default-v2/icons/x16/layout_header_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..09f6832bd1ddea06c32634ede6c14b17d739c9c8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_header_2.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_2_equal.png b/interface/web/themes/default-v2/icons/x16/layout_header_2_equal.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0dfd6c868e1ac860783c6325f69993b19084f8d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_header_2_equal.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_3.png b/interface/web/themes/default-v2/icons/x16/layout_header_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..64a48ca7ddceb2a59ad7d4640bee17b2d357fa94
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_header_3.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_3_mix.png b/interface/web/themes/default-v2/icons/x16/layout_header_3_mix.png
new file mode 100644
index 0000000000000000000000000000000000000000..22e67bd80d927341198e4cfd840e768370eae380
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_header_3_mix.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_footer.png b/interface/web/themes/default-v2/icons/x16/layout_header_footer.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a739f856ff1d9b31b252ddae4b51ade1e8556eb
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_header_footer.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_footer_2.png b/interface/web/themes/default-v2/icons/x16/layout_header_footer_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..22b7d59efd63f846631d39fe8521c822e5711df2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_header_footer_2.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_footer_2_equal.png b/interface/web/themes/default-v2/icons/x16/layout_header_footer_2_equal.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a6ab31a69fc66fc95680c24d8612fef0e6ac71b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_header_footer_2_equal.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_footer_3.png b/interface/web/themes/default-v2/icons/x16/layout_header_footer_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..d97d175d410ed78b1b797745c10a473c820cb049
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_header_footer_3.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_header_footer_3_mix.png b/interface/web/themes/default-v2/icons/x16/layout_header_footer_3_mix.png
new file mode 100644
index 0000000000000000000000000000000000000000..4aefc407086f8aeccc557556bd52b3c242a48a35
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_header_footer_3_mix.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_join.png b/interface/web/themes/default-v2/icons/x16/layout_join.png
new file mode 100644
index 0000000000000000000000000000000000000000..be491fc6370cfc0296b69f67cf4117dd15e7830a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_join.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/layout_split.png b/interface/web/themes/default-v2/icons/x16/layout_split.png
new file mode 100644
index 0000000000000000000000000000000000000000..986005ef864f6705a257b71be88dc70a347b57b7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/layout_split.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy.png b/interface/web/themes/default-v2/icons/x16/lifebuoy.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bcb23d54859109bd6a05c79305771132409f502
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lifebuoy.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy_arrow.png b/interface/web/themes/default-v2/icons/x16/lifebuoy_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab33a2deb2ae3134df17174fa1dd9106e70019e0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lifebuoy_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy_exclamation.png b/interface/web/themes/default-v2/icons/x16/lifebuoy_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..020a1ee6ba12e8a2f630a00485ed852945aa7e55
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lifebuoy_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy_minus.png b/interface/web/themes/default-v2/icons/x16/lifebuoy_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..7af080733fbf5270fa79088da28885084ba6fd90
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lifebuoy_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy_pencil.png b/interface/web/themes/default-v2/icons/x16/lifebuoy_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf2278644af1a7e0b93d404175e3255a5a0950a1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lifebuoy_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lifebuoy_plus.png b/interface/web/themes/default-v2/icons/x16/lifebuoy_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d41f5b48bdde521dcbafdbe0a1118cc6ff52cf41
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lifebuoy_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb.png b/interface/web/themes/default-v2/icons/x16/light_bulb.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff6feafc907b8b69bab4173d9977ee0e7faa87e3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/light_bulb.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb__arrow.png b/interface/web/themes/default-v2/icons/x16/light_bulb__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..563310a894862e323c6845f05b18703a84a2e748
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/light_bulb__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb__exclamation.png b/interface/web/themes/default-v2/icons/x16/light_bulb__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..c82a99c72d97421fcc3bf95aeb6d1d8830d1e7e3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/light_bulb__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb__minus.png b/interface/web/themes/default-v2/icons/x16/light_bulb__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cae1dcde99fd14849674efac125829744995882
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/light_bulb__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb__pencil.png b/interface/web/themes/default-v2/icons/x16/light_bulb__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..5864514fe8f21fb978a52567a62880ff988eb66d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/light_bulb__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb__plus.png b/interface/web/themes/default-v2/icons/x16/light_bulb__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..7496b6d66889237ba46cd82fc98b3f634ba2a6d5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/light_bulb__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb_off.png b/interface/web/themes/default-v2/icons/x16/light_bulb_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..496925d75d999e39bb5c70d466c4cf7d57260013
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/light_bulb_off.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb_small.png b/interface/web/themes/default-v2/icons/x16/light_bulb_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..df440bcc74bf5ca510ce80d6a322722cc2fa0223
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/light_bulb_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/light_bulb_small_off.png b/interface/web/themes/default-v2/icons/x16/light_bulb_small_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..d28c98ee6d56b57059a411d12b5c243e48dea6d6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/light_bulb_small_off.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning.png b/interface/web/themes/default-v2/icons/x16/lightning.png
new file mode 100644
index 0000000000000000000000000000000000000000..be7e052a78fddee530a86072b94fef8de06378c2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lightning.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning__arrow.png b/interface/web/themes/default-v2/icons/x16/lightning__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..58d746438837632aa880a7195d28380411ee8e2e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lightning__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning__exclamation.png b/interface/web/themes/default-v2/icons/x16/lightning__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..52b49c7d8e2f87853ae63c5aebad277a7a81314b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lightning__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning__minus.png b/interface/web/themes/default-v2/icons/x16/lightning__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5d04caf25c843ac2adef4a993a73fa97bd716e1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lightning__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning__pencil.png b/interface/web/themes/default-v2/icons/x16/lightning__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9eb9c9b6c90cbbf29c3eb09ef9b39160a42e8f7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lightning__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning__plus.png b/interface/web/themes/default-v2/icons/x16/lightning__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..00980e1afbb16969433fb49ee5f2c2d0634ca7af
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lightning__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning_disable.png b/interface/web/themes/default-v2/icons/x16/lightning_disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..94e24a0bc71117e205fe220ad9173f07dae7a475
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lightning_disable.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lightning_small.png b/interface/web/themes/default-v2/icons/x16/lightning_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..df0a425d5ec039f637315c3694da47c45fcde99c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lightning_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/loading.gif b/interface/web/themes/default-v2/icons/x16/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..19afda1a39b4543b4745fe34a973988b77787f4d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/loading.gif differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock.png b/interface/web/themes/default-v2/icons/x16/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..755dd0b1408d8ab02d7e278d55010016bbbbebbd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lock.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock__arrow.png b/interface/web/themes/default-v2/icons/x16/lock__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..51b923d5851685deda4afc725145e05688fa041d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lock__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock__exclamation.png b/interface/web/themes/default-v2/icons/x16/lock__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..6574515db6fecab273a38158807a444a567400cc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lock__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock__minus.png b/interface/web/themes/default-v2/icons/x16/lock__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1326f4c3bcb74c9807f3e5db28d14b1ca93e307b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lock__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock__pencil.png b/interface/web/themes/default-v2/icons/x16/lock__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e6581d84e5a9b60d39ed75ae38d4dc8ec83af51
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lock__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock__plus.png b/interface/web/themes/default-v2/icons/x16/lock__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..351141a82640ac9f490b4740175ff6b52de7769a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lock__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock_disable.png b/interface/web/themes/default-v2/icons/x16/lock_disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d7881599425646001d03024fe5c8a44306f557c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lock_disable.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock_small.png b/interface/web/themes/default-v2/icons/x16/lock_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2378e9788a3c21bcaa1dee2e68ec41e25c2a137
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lock_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/lock_unlock.png b/interface/web/themes/default-v2/icons/x16/lock_unlock.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cd7b7b2986a92e889c55474f49c162444e57496
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/lock_unlock.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/logout.png b/interface/web/themes/default-v2/icons/x16/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fa077ee240bc809cf29b1d8199f2dcaebe43dfc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/logout.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet.png b/interface/web/themes/default-v2/icons/x16/magnet.png
new file mode 100644
index 0000000000000000000000000000000000000000..f83b48c0bd2d3298bbcaeb45ae990b25d592b881
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnet.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet__arrow.png b/interface/web/themes/default-v2/icons/x16/magnet__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f366db3a0afdc3f161781ff6d613865bf5b6d80b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnet__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet__exclamation.png b/interface/web/themes/default-v2/icons/x16/magnet__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..723c3b861fdb7fcce8b8bc6a7db1bb6680b144c0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnet__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet__minus.png b/interface/web/themes/default-v2/icons/x16/magnet__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..066f2563ed763d14b61bf65f79134ea808ee6ccd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnet__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet__pencil.png b/interface/web/themes/default-v2/icons/x16/magnet__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..83894aff6dc3bf5a6830b4df311e2ed95460bd4c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnet__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet__plus.png b/interface/web/themes/default-v2/icons/x16/magnet__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0d7ee5c3e02e7d2edee3355163577e8262828b2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnet__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet_disable.png b/interface/web/themes/default-v2/icons/x16/magnet_disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ab9c3dd65727ef04ea60841f5318dfaf3d37dad
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnet_disable.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnet_small.png b/interface/web/themes/default-v2/icons/x16/magnet_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..061e36a4cbc3cecd7c16e27cfe6ab6a00d1a54fc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnet_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier.png b/interface/web/themes/default-v2/icons/x16/magnifier.png
new file mode 100644
index 0000000000000000000000000000000000000000..02e7e67f81846ff7dd79d345d918fe1116ea5938
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier__arrow.png b/interface/web/themes/default-v2/icons/x16/magnifier__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..65cd5c532d7129c8044d313954b7760b06ad39e9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier__exclamation.png b/interface/web/themes/default-v2/icons/x16/magnifier__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..037be024fecf3b9398603cc4de3fea838d782a0d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier__minus.png b/interface/web/themes/default-v2/icons/x16/magnifier__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6bccdd05a04e836429c68e6710747d0865c826c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier__pencil.png b/interface/web/themes/default-v2/icons/x16/magnifier__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..10a668d4f50db46c5a81516f2dda345ec5a7c164
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier__plus.png b/interface/web/themes/default-v2/icons/x16/magnifier__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..75163988e7ff42e9cee56c3ebf3b7841d8ac82d0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_left.png b/interface/web/themes/default-v2/icons/x16/magnifier_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a8557f4cd64d7b480670b2dc01f5b4ee0bceaa5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier_left.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_medium.png b/interface/web/themes/default-v2/icons/x16/magnifier_medium.png
new file mode 100644
index 0000000000000000000000000000000000000000..7dae0e12239f84486d6f536b136284a3cf3bb60a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier_medium.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_medium_left.png b/interface/web/themes/default-v2/icons/x16/magnifier_medium_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..81c4089dfeeafd2c2f7c7bf924df1d2e9711e0f6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier_medium_left.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_small.png b/interface/web/themes/default-v2/icons/x16/magnifier_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..08fdd8c61ccfd8e4b19eb843b2ba7acba2af60dc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_zoom.png b/interface/web/themes/default-v2/icons/x16/magnifier_zoom.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9013037f5548c1d5199ba478f923234b794e76a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier_zoom.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_zoom_actual.png b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_actual.png
new file mode 100644
index 0000000000000000000000000000000000000000..b01ae0b1dd38544b54281d4e0dd4642c14ffc356
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_actual.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_zoom_fit.png b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_fit.png
new file mode 100644
index 0000000000000000000000000000000000000000..278c77d0d7508d399cc20d823e10201209db432a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_fit.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/magnifier_zoom_out.png b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cd83545dfd87572956243e2a3872539d660085c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/magnifier_zoom_out.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail.png b/interface/web/themes/default-v2/icons/x16/mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f7a6ca4c934392541726e840dd85af9687c159c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mail.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail__arrow.png b/interface/web/themes/default-v2/icons/x16/mail__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..43451749864a8e641910cff2ba40a22234492c77
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mail__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail__exclamation.png b/interface/web/themes/default-v2/icons/x16/mail__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf0344eabcc1da68538754b0c74d52ba6d3de1e6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mail__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail__minus.png b/interface/web/themes/default-v2/icons/x16/mail__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..274713683e92dec0aac6e3313a8edce56938f279
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mail__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail__pencil.png b/interface/web/themes/default-v2/icons/x16/mail__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..47e552d8189a6009ec5f538bee6d02d332aaa97e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mail__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail__plus.png b/interface/web/themes/default-v2/icons/x16/mail__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e7e259dfc19351c2a443991691b243cb5d44d54
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mail__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail_open.png b/interface/web/themes/default-v2/icons/x16/mail_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..634b83f282a6c1b49802094c4d59aeb26af51bbc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mail_open.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail_open_document.png b/interface/web/themes/default-v2/icons/x16/mail_open_document.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9277d472a810915ac01dc115f22fb2586c9096e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mail_open_document.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail_open_film.png b/interface/web/themes/default-v2/icons/x16/mail_open_film.png
new file mode 100644
index 0000000000000000000000000000000000000000..3174aab5f884639d6872e272835ded7fb54b7da4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mail_open_film.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail_open_image.png b/interface/web/themes/default-v2/icons/x16/mail_open_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ac1a42b1611368061e8e4274c067d033e494d85
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mail_open_image.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mail_small.png b/interface/web/themes/default-v2/icons/x16/mail_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..318490b36408923bf4a7b200b38a0cc144cdf78f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mail_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails.png b/interface/web/themes/default-v2/icons/x16/mails.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e7b08db8d5e662706b5c69ee0edade7ccda2013
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mails.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_arrow.png b/interface/web/themes/default-v2/icons/x16/mails_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..49988fa7679584f0dfe8a00ebfae4969a402bf07
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mails_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_exclamation.png b/interface/web/themes/default-v2/icons/x16/mails_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..552882964faeab652bc946d71093172140147c4e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mails_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_minus.png b/interface/web/themes/default-v2/icons/x16/mails_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb3ec83d4812518986503fdc7ab18fa44bba8a4d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mails_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_pencil.png b/interface/web/themes/default-v2/icons/x16/mails_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..63a8507c015b3f4bf049c9da2f3bc7dfdf8792de
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mails_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_plus.png b/interface/web/themes/default-v2/icons/x16/mails_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3f2802dcb0be9521ee4382e3ef0b6a012f7cd59
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mails_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/mails_stack.png b/interface/web/themes/default-v2/icons/x16/mails_stack.png
new file mode 100644
index 0000000000000000000000000000000000000000..d81d95d697f46745c730e33709733ac62af932a4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/mails_stack.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player.png b/interface/web/themes/default-v2/icons/x16/media_player.png
new file mode 100644
index 0000000000000000000000000000000000000000..b35317b898ad629cf702fb22e6b679b123bd23ae
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player__arrow.png b/interface/web/themes/default-v2/icons/x16/media_player__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf012c86d84ea366b143bf5b65e231b20cb0cd6f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player__exclamation.png b/interface/web/themes/default-v2/icons/x16/media_player__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..08e2647eeb1ccae8fa03a246f2a2659c12f23481
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player__minus.png b/interface/web/themes/default-v2/icons/x16/media_player__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fc1828304a46982d2d556fdcfc1245fa51b7229
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player__pencil.png b/interface/web/themes/default-v2/icons/x16/media_player__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..73441b4189ea787b64f7943b5b5585a70df4ebef
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player__plus.png b/interface/web/themes/default-v2/icons/x16/media_player__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba11ab750f432fa263b815d9efd42c78614e13ad
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_black.png b/interface/web/themes/default-v2/icons/x16/media_player_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e7d7189e4583c517711457c449358017d75a2d5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_black.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium.png b/interface/web/themes/default-v2/icons/x16/media_player_medium.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddabbf5a86865f2f6af0bedf45bf5b4754663c1c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_medium.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium_black.png b/interface/web/themes/default-v2/icons/x16/media_player_medium_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fbe8d6a8d43b232a7c7174fb67cf1a86e605779
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_medium_black.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium_blue.png b/interface/web/themes/default-v2/icons/x16/media_player_medium_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..1edce9727b32a60f26dfd350a9995ab66c670018
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_medium_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium_green.png b/interface/web/themes/default-v2/icons/x16/media_player_medium_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..38d6be495237a9bc98c1a0f8df31ec152ed6dbdb
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_medium_green.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium_pink.png b/interface/web/themes/default-v2/icons/x16/media_player_medium_pink.png
new file mode 100644
index 0000000000000000000000000000000000000000..ceee74a3939194b5a2d9a520db65254e8ea72c28
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_medium_pink.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_medium_red.png b/interface/web/themes/default-v2/icons/x16/media_player_medium_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebc148386d3bfc14018bf38d303ebc54049f28b7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_medium_red.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_small.png b/interface/web/themes/default-v2/icons/x16/media_player_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..f976ff5ffd24cd70f6e9e3149ff2f95f1518cb9a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_small_blue.png b/interface/web/themes/default-v2/icons/x16/media_player_small_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe169fb6db9b9597e451d9449c6217b7b614a7ab
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_small_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_small_green.png b/interface/web/themes/default-v2/icons/x16/media_player_small_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..496cf0c40d67ec6d2555c258e824739babfa3a7c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_small_green.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_small_purple.png b/interface/web/themes/default-v2/icons/x16/media_player_small_purple.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd2ceb6832f71c1e0a137ba41e1d904cb05a75e9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_small_purple.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_player_small_red.png b/interface/web/themes/default-v2/icons/x16/media_player_small_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b3159354126dc2929a20950e945fd057dffdf85
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_player_small_red.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players.png b/interface/web/themes/default-v2/icons/x16/media_players.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7d7f6c71d87b5ca0d6bb8b6ba6f582feab62f56
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_players.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players_arrow.png b/interface/web/themes/default-v2/icons/x16/media_players_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..33b68542881863063216ce2803230b6747da0b50
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_players_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players_exclamation.png b/interface/web/themes/default-v2/icons/x16/media_players_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ae760b68dadc9b95beb3bea5f5e4c33f753711b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_players_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players_minus.png b/interface/web/themes/default-v2/icons/x16/media_players_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b266f250a86aca6b631819fe986a3700bbb7fab
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_players_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players_pencil.png b/interface/web/themes/default-v2/icons/x16/media_players_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..bad68cd1cc40367453f30b250693a8116297c1b8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_players_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/media_players_plus.png b/interface/web/themes/default-v2/icons/x16/media_players_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e29e49d58fa83f22f8473b40b768608ea10ea491
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/media_players_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone.png b/interface/web/themes/default-v2/icons/x16/microphone.png
new file mode 100644
index 0000000000000000000000000000000000000000..5817a1cfb4c3e28889a0b91fc388d85319a81058
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/microphone.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone_arrow.png b/interface/web/themes/default-v2/icons/x16/microphone_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a7c89755fd2108f1c24f8843241cc6ea334101b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/microphone_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone_exclamation.png b/interface/web/themes/default-v2/icons/x16/microphone_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e41bd421e9854147e18695c8cbf3a47a73d9205
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/microphone_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone_minus.png b/interface/web/themes/default-v2/icons/x16/microphone_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..17f3639d8bfea5405ade50c81a2e12c4570529ae
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/microphone_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone_pencil.png b/interface/web/themes/default-v2/icons/x16/microphone_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa41af61340de9aae7a8057866905ca524eb7953
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/microphone_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/microphone_plus.png b/interface/web/themes/default-v2/icons/x16/microphone_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5776f47d05a652d50dc2d53228e10b8b794ffc5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/microphone_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus.png b/interface/web/themes/default-v2/icons/x16/minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d59994cfc0c651ef5606ac6ff0a048df7dcd3f42
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus_circle.png b/interface/web/themes/default-v2/icons/x16/minus_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0d3938c03af8d1398569fb95b5bec0b7de72bd5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/minus_circle.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus_circle_frame.png b/interface/web/themes/default-v2/icons/x16/minus_circle_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b1654ab9065964cb01dbd42006c32713911a175
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/minus_circle_frame.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus_shield.png b/interface/web/themes/default-v2/icons/x16/minus_shield.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5da92ad1503b86f7a1e4a4a1c5c8d459442afff
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/minus_shield.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus_small.png b/interface/web/themes/default-v2/icons/x16/minus_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ec9487f6a13ed9f4209f7d00f0d6f787dc2d138
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/minus_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/minus_small_circle.png b/interface/web/themes/default-v2/icons/x16/minus_small_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..30b6e2757e0fa0a44ad7fa05b88ba87f40ebadee
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/minus_small_circle.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/music.png b/interface/web/themes/default-v2/icons/x16/music.png
new file mode 100644
index 0000000000000000000000000000000000000000..a78df8c2ac4a97c80f9cde1ca6b514063d7878e4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/music.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_arrow.png b/interface/web/themes/default-v2/icons/x16/music_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..1215fd2e9b7ce34cdb1ee71ba403e7dcf49f284b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/music_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_exclamation.png b/interface/web/themes/default-v2/icons/x16/music_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..68048842170277dc482d642ed8562651af0b3fb7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/music_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_minus.png b/interface/web/themes/default-v2/icons/x16/music_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..284b16559f9da9c969feee3e0f9550908b8a662f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/music_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_pencil.png b/interface/web/themes/default-v2/icons/x16/music_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6b6030aed2f4b14f9538245acd8014d3a09c13c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/music_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_plus.png b/interface/web/themes/default-v2/icons/x16/music_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..69ca7cb72de82c23e44c837f10424e5369705b30
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/music_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/music_small.png b/interface/web/themes/default-v2/icons/x16/music_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..54c1417abde35cd9e5b902927b761d42ca8de774
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/music_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper.png b/interface/web/themes/default-v2/icons/x16/newspaper.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6e3bf83fe83c24076b73e249383e4347f34f4d6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspaper.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper_arrow.png b/interface/web/themes/default-v2/icons/x16/newspaper_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..eac7fce6e2e81f06c94d220a4526781cb8f014e3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspaper_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper_exclamation.png b/interface/web/themes/default-v2/icons/x16/newspaper_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..04a39d4957b5ea81c86acc521895890432fb0388
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspaper_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper_minus.png b/interface/web/themes/default-v2/icons/x16/newspaper_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6606c0196448a6908626d2a2c7c2b93d01845afd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspaper_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper_pencil.png b/interface/web/themes/default-v2/icons/x16/newspaper_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d1813a77c2e743e432e51696f551113aa69b63e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspaper_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspaper_plus.png b/interface/web/themes/default-v2/icons/x16/newspaper_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a53ada2f109ccd75de635cbd8104f505ffec899
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspaper_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers.png b/interface/web/themes/default-v2/icons/x16/newspapers.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffa56e52cf5b961971f1a89c3b0868872cd6febf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspapers.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers_arrow.png b/interface/web/themes/default-v2/icons/x16/newspapers_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..132635e307041eded0078bbbe3d75fdc4b4c28a9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspapers_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers_exclamation.png b/interface/web/themes/default-v2/icons/x16/newspapers_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a09215d82998e63cc75880e25575ef68de1f5a7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspapers_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers_minus.png b/interface/web/themes/default-v2/icons/x16/newspapers_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..983a4153f881da0c8fab09af83e2b881f67a8c0b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspapers_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers_pencil.png b/interface/web/themes/default-v2/icons/x16/newspapers_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..c950ade8c20189c0a3452c5375fcdc933e686cb0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspapers_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/newspapers_plus.png b/interface/web/themes/default-v2/icons/x16/newspapers_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f5747bc884f420211f11bbc53c0f2a881535f34
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/newspapers_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook.png b/interface/web/themes/default-v2/icons/x16/notebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d5e4e1300719fd124709b0c58f080f4c3ff3de2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebook.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook_arrow.png b/interface/web/themes/default-v2/icons/x16/notebook_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..45174b94cd538b7718e81d49c520091f117362e3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebook_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook_exclamation.png b/interface/web/themes/default-v2/icons/x16/notebook_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ddb7455b4bdc79aec1e298f2801893433f4e586
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebook_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook_minus.png b/interface/web/themes/default-v2/icons/x16/notebook_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..208b707c5728f0255067477227b2de1dbee8d627
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebook_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook_pencil.png b/interface/web/themes/default-v2/icons/x16/notebook_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..207c1f07471d711d7c7c257ee2a75477a8f0672c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebook_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebook_plus.png b/interface/web/themes/default-v2/icons/x16/notebook_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fed83ba6f4119dfb6c1e3772f4422d452969452
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebook_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks.png b/interface/web/themes/default-v2/icons/x16/notebooks.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d3796740d674f0e493325f2ccff3af00778d975
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebooks.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks_arrow.png b/interface/web/themes/default-v2/icons/x16/notebooks_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..92f98042b84cc09ef388bf81f0be0f3b2afa9c46
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebooks_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks_exclamation.png b/interface/web/themes/default-v2/icons/x16/notebooks_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cafa5e040cd919a208a58fa42c46cdd30942253
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebooks_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks_minus.png b/interface/web/themes/default-v2/icons/x16/notebooks_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec879ca27c1afd2f6038c071d38e756c2f5f1f84
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebooks_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks_pencil.png b/interface/web/themes/default-v2/icons/x16/notebooks_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..69cedaf6fca1afa0182aa2fd350df9137cf72044
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebooks_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/notebooks_plus.png b/interface/web/themes/default-v2/icons/x16/notebooks_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..70cb2f49448bff2ab967b892294d6a0a3916d19b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/notebooks_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can.png b/interface/web/themes/default-v2/icons/x16/paint_can.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac2c4a3d19ac3403896ff00e1a5cc60357ecf1d8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paint_can.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can_arrow.png b/interface/web/themes/default-v2/icons/x16/paint_can_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2dc31cb5f20f740e78d1016ec46a16556b9e7f4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paint_can_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can_exclamation.png b/interface/web/themes/default-v2/icons/x16/paint_can_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..51516bfae5d84046b9d00c1662d60a1dbf8c63f8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paint_can_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can_minus.png b/interface/web/themes/default-v2/icons/x16/paint_can_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..90edf3f90b16ffdd57474d22b89604d013c159bb
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paint_can_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can_pencil.png b/interface/web/themes/default-v2/icons/x16/paint_can_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..536f926d38f570c6b453aceb38ba7758f339ea15
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paint_can_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paint_can_plus.png b/interface/web/themes/default-v2/icons/x16/paint_can_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e52664895d0c4f913a495f211ef9d510ec39f15c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paint_can_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette.png b/interface/web/themes/default-v2/icons/x16/palette.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9d79643c83085fe5d4c6c6f1df632a703f544e0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/palette.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette_arrow.png b/interface/web/themes/default-v2/icons/x16/palette_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a96f6cedc85d6d1084473accfc9636ceb75cc82
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/palette_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette_exclamation.png b/interface/web/themes/default-v2/icons/x16/palette_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cc0d6a7b14ab09fd62dae01a6d5d6aae3fa6578
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/palette_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette_minus.png b/interface/web/themes/default-v2/icons/x16/palette_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d6efca893c965765a62c9927c97e676d89881d4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/palette_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette_pencil.png b/interface/web/themes/default-v2/icons/x16/palette_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee11bf4f4fb32f1ee5503f5705d851f50ad12ac1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/palette_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/palette_plus.png b/interface/web/themes/default-v2/icons/x16/palette_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0032fc45b769461defb8f1487403d101b82131b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/palette_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag.png b/interface/web/themes/default-v2/icons/x16/paper_bag.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d6de20f3e17cf261911737558cb382e0c6a14a8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paper_bag.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag_arrow.png b/interface/web/themes/default-v2/icons/x16/paper_bag_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f5135868a7b241af28a4446c1596f4d7227f626
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paper_bag_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag_exclamation.png b/interface/web/themes/default-v2/icons/x16/paper_bag_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc1836d734a4b1cdf948117bfb5a83dec141eae8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paper_bag_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag_minus.png b/interface/web/themes/default-v2/icons/x16/paper_bag_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa334ae2ba9905d86dd5aa72e113088b9ac2f5e5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paper_bag_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag_pencil.png b/interface/web/themes/default-v2/icons/x16/paper_bag_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a9648b90485239ad558e9de99a7f45c71a3a094
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paper_bag_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/paper_bag_plus.png b/interface/web/themes/default-v2/icons/x16/paper_bag_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..176033e2db3a3f93fb8111ad0c32fce0d736d542
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/paper_bag_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil.png b/interface/web/themes/default-v2/icons/x16/pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..69810272887e7c7059e8a83789743d0b0272eca1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil_arrow.png b/interface/web/themes/default-v2/icons/x16/pencil_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..91efbde7c1da01c6ffec6b91611b6678d819691e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pencil_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil_exclamation.png b/interface/web/themes/default-v2/icons/x16/pencil_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..64c53af26c969c20431ac124f383c21e0d120f84
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pencil_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil_minus.png b/interface/web/themes/default-v2/icons/x16/pencil_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a827a2adafcdf58467674ed3ab9a9fe435bee9d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pencil_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil_plus.png b/interface/web/themes/default-v2/icons/x16/pencil_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cc6e2d38db967a2f45f51c099b44b3f5ae5f1df
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pencil_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pencil_small.png b/interface/web/themes/default-v2/icons/x16/pencil_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..921f23bc92b7efc9ba121f4b5fa2c93bf61a1e05
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pencil_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album.png b/interface/web/themes/default-v2/icons/x16/photo_album.png
new file mode 100644
index 0000000000000000000000000000000000000000..27747ad29df08c1ba11d82dceadeddaad8a9dd29
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/photo_album.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album__arrow.png b/interface/web/themes/default-v2/icons/x16/photo_album__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2572e8dd37a192fa51753ee10cda6096715b129
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/photo_album__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album__exclamation.png b/interface/web/themes/default-v2/icons/x16/photo_album__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5e63561120ca3126350ae06477c5b42f86babd0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/photo_album__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album__minus.png b/interface/web/themes/default-v2/icons/x16/photo_album__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2af67d91491a220182d60d0b7ddaa3fa3b8025f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/photo_album__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album__pencil.png b/interface/web/themes/default-v2/icons/x16/photo_album__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..6be3f7b429ba9f1c9bab2b768079654543852178
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/photo_album__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album__plus.png b/interface/web/themes/default-v2/icons/x16/photo_album__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..09d29a3863e9e6a3dd98f6e2e901d78cf6ba6f6b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/photo_album__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/photo_album_blue.png b/interface/web/themes/default-v2/icons/x16/photo_album_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..5684ecbdeac0ceee228cda72305b2d0a883f614c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/photo_album_blue.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano.png b/interface/web/themes/default-v2/icons/x16/piano.png
new file mode 100644
index 0000000000000000000000000000000000000000..061578628950c0b092491d8c0a81ed2e3e085e4d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/piano.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano_arrow.png b/interface/web/themes/default-v2/icons/x16/piano_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..337f72b9a5a8b50c20e0785d0e07b29bbd8c7883
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/piano_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano_exclamation.png b/interface/web/themes/default-v2/icons/x16/piano_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..108cef2838b9f46d1bd74b13ab5ad6ceba90276f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/piano_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano_minus.png b/interface/web/themes/default-v2/icons/x16/piano_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..091520cc1c423129bc0a26b7cb5ae6a4f9e2adf0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/piano_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano_pencil.png b/interface/web/themes/default-v2/icons/x16/piano_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f1de2bf45b9ecaaf7e656f2ec2efd443795a3a9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/piano_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/piano_plus.png b/interface/web/themes/default-v2/icons/x16/piano_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..26a5144860f419fcb43d4b86244399e5a1e9065e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/piano_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture.png b/interface/web/themes/default-v2/icons/x16/picture.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1ddcc6296587f5d591c9ccbc6d76c568189115a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/picture.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_arrow.png b/interface/web/themes/default-v2/icons/x16/picture_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..d50d357cba0e9a13b61b41d0b911248e0aad6a1f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/picture_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_exclamation.png b/interface/web/themes/default-v2/icons/x16/picture_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4e5ff12508b2281d9284f974622103937c4ecfd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/picture_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_minus.png b/interface/web/themes/default-v2/icons/x16/picture_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b937caf91468c67383dd37d56b0460c0eccda8c0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/picture_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_pencil.png b/interface/web/themes/default-v2/icons/x16/picture_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..25fb9f73d2751e6f9ca105842ca8f31d8223ad66
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/picture_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_plus.png b/interface/web/themes/default-v2/icons/x16/picture_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b10f9227a83f3d02a1ebf22712788a0a4b9ca60
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/picture_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_small.png b/interface/web/themes/default-v2/icons/x16/picture_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..c25fa6f928d5f9c7c2ab5f2fdcb85e77143ff412
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/picture_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_small_sunset.png b/interface/web/themes/default-v2/icons/x16/picture_small_sunset.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a35685fd2f5f30ea253e72206687975622d979e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/picture_small_sunset.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/picture_sunset.png b/interface/web/themes/default-v2/icons/x16/picture_sunset.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d59a8de25e3de673947f0612a1c04ba5546de65
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/picture_sunset.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures.png b/interface/web/themes/default-v2/icons/x16/pictures.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2401b541d3be6f11ad1053380a93b060b8bd4db
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pictures.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures_arrow.png b/interface/web/themes/default-v2/icons/x16/pictures_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb641240890a4c5bbb41df516bccfa842a889a5a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pictures_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures_exclamation.png b/interface/web/themes/default-v2/icons/x16/pictures_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a06f01198945fc972aea7f3df24a5c7b62b9c40
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pictures_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures_minus.png b/interface/web/themes/default-v2/icons/x16/pictures_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f1e1ce0f021ef1821320efdbeb575fbad2128f0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pictures_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures_pencil.png b/interface/web/themes/default-v2/icons/x16/pictures_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..86ef9e02b9185e1c7aba743b7122ddba29597f15
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pictures_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pictures_plus.png b/interface/web/themes/default-v2/icons/x16/pictures_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..636f3e5394187d94b6e8f1a5aba56a1897622345
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pictures_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill.png b/interface/web/themes/default-v2/icons/x16/pill.png
new file mode 100644
index 0000000000000000000000000000000000000000..442e4ed1bd066238eee252196d7d5ad97641392d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pill.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_arrow.png b/interface/web/themes/default-v2/icons/x16/pill_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5990fa7290e0f5ff030acbd400b12360e62884c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pill_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_exclamation.png b/interface/web/themes/default-v2/icons/x16/pill_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..07a2af521906fd92f55cdc959993c9cdfec7bc38
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pill_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_minus.png b/interface/web/themes/default-v2/icons/x16/pill_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d31ac27711e4b5ecc2956789d8c0871a50a85dc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pill_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_pencil.png b/interface/web/themes/default-v2/icons/x16/pill_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..90d40a8a4e1b51172698a483b209749a7f55a22c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pill_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_plus.png b/interface/web/themes/default-v2/icons/x16/pill_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b206fb51acd2b814fe53a25f433669bcee6b1d96
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pill_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pill_small.png b/interface/web/themes/default-v2/icons/x16/pill_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b355ce4af668a5e8b63ea2383077011adcaa856
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pill_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin.png b/interface/web/themes/default-v2/icons/x16/pin.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8762f47110db5da9ce7ce1e6ef93dc7fc5413a0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pin.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin_arrow.png b/interface/web/themes/default-v2/icons/x16/pin_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..02034d6cd1a03a0993d605175ed6370d399f4fe6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pin_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin_exclamation.png b/interface/web/themes/default-v2/icons/x16/pin_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..e342d01f39e1dba01d162e1e7420dc848ecdb425
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pin_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin_minus.png b/interface/web/themes/default-v2/icons/x16/pin_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..19a7dc00786edda7304591f9fdf2365d160a055d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pin_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin_pencil.png b/interface/web/themes/default-v2/icons/x16/pin_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..d54642081131d0ac086933c8bec185d5ac7638c1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pin_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pin_plus.png b/interface/web/themes/default-v2/icons/x16/pin_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..db50e1cef1e68547b2cdebf178ec59b288226350
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pin_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette.png b/interface/web/themes/default-v2/icons/x16/pipette.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e52abe78c4a068fdfc13fe23f6ae7235a5be83f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pipette.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette_arrow.png b/interface/web/themes/default-v2/icons/x16/pipette_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..615188b42475b6263a7ed904351fba3c17a70380
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pipette_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette_exclamation.png b/interface/web/themes/default-v2/icons/x16/pipette_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..63443d39e2eac1624db0b05abe2dea0694274b8a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pipette_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette_minus.png b/interface/web/themes/default-v2/icons/x16/pipette_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e239e42474dc56dcc3e96faabc6f0bad435faa4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pipette_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette_pencil.png b/interface/web/themes/default-v2/icons/x16/pipette_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..066d012cd42f0df30b48ae9385e70fb4e583ecfd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pipette_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/pipette_plus.png b/interface/web/themes/default-v2/icons/x16/pipette_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..058e6d91a157e02b7e48fc7cbed04ace4f9d2233
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/pipette_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card.png b/interface/web/themes/default-v2/icons/x16/playing_card.png
new file mode 100644
index 0000000000000000000000000000000000000000..15094faebb57d7920bf5738b2b602bffb184638e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/playing_card.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card_arrow.png b/interface/web/themes/default-v2/icons/x16/playing_card_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..95884ded14d369a058b3d72d5272699d316da77b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/playing_card_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card_exclamation.png b/interface/web/themes/default-v2/icons/x16/playing_card_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5c648f52ec465ce953720f2d82f64509b91029b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/playing_card_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card_minus.png b/interface/web/themes/default-v2/icons/x16/playing_card_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c1e50e502f10944da18cb6206d03bbb990b617e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/playing_card_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card_pencil.png b/interface/web/themes/default-v2/icons/x16/playing_card_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c0364db32f1e4b88223c36565a39dc66e9ab618
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/playing_card_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/playing_card_plus.png b/interface/web/themes/default-v2/icons/x16/playing_card_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..800aa726eef4d2fac60de57884cbb6852ddd1b80
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/playing_card_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug.png b/interface/web/themes/default-v2/icons/x16/plug.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbc85ac2e99439ef061f8968aa81d6245cbbd18f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plug.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug_arrow.png b/interface/web/themes/default-v2/icons/x16/plug_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..347bfc6e8b7edee7df5ae6e4edeb2131ad620792
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plug_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug_exclamation.png b/interface/web/themes/default-v2/icons/x16/plug_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee67f1d92aa8c5fed75fc9cf256bb190f3a33bf9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plug_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug_minus.png b/interface/web/themes/default-v2/icons/x16/plug_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3869456cb20c4b2ed8b9461584d266361e7d0ac
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plug_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug_pencil.png b/interface/web/themes/default-v2/icons/x16/plug_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..378e2018f4bc8e1e27ac0060eba78f71c013aaa0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plug_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plug_plus.png b/interface/web/themes/default-v2/icons/x16/plug_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d541cb63989f5807aa3b261739e24b7667b090c2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plug_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus.png b/interface/web/themes/default-v2/icons/x16/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fe36a1b9816382b5d663a2d5ddcd88b48d233f8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus_circle.png b/interface/web/themes/default-v2/icons/x16/plus_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..21d5f83fc70e2127904fad6ed1d7976d0764e26e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plus_circle.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus_circle_frame.png b/interface/web/themes/default-v2/icons/x16/plus_circle_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..288625adf55c7fcd125ac7428be4bc9136e5a1c1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plus_circle_frame.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus_shield.png b/interface/web/themes/default-v2/icons/x16/plus_shield.png
new file mode 100644
index 0000000000000000000000000000000000000000..f703e928baa807a9c60389e140bb46c4964b35e2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plus_shield.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus_small.png b/interface/web/themes/default-v2/icons/x16/plus_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..da116dcc3d175f7b5edffee92fd32d8075b46c38
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plus_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/plus_small_circle.png b/interface/web/themes/default-v2/icons/x16/plus_small_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcf7272cf1b067ceca8b1af3b511d8a0ee1b3211
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/plus_small_circle.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer.png b/interface/web/themes/default-v2/icons/x16/printer.png
new file mode 100644
index 0000000000000000000000000000000000000000..da4d0ec14d2d60469e7882e487098288e274901e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/printer.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer__arrow.png b/interface/web/themes/default-v2/icons/x16/printer__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c9e8ea1f96e438a018b60fa174ec9359c091b2d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/printer__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer__exclamation.png b/interface/web/themes/default-v2/icons/x16/printer__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b5cc29f005416c9272772a309cb5f0cf0191d62
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/printer__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer__minus.png b/interface/web/themes/default-v2/icons/x16/printer__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..af5d449aec33a49c2b1d7e3dd4d22eb613493a08
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/printer__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer__pencil.png b/interface/web/themes/default-v2/icons/x16/printer__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1a382aaf58db3db55959197d91124e78343175b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/printer__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer__plus.png b/interface/web/themes/default-v2/icons/x16/printer__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4608a84025ee3104ae1a9baf49f5eff565107d0b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/printer__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer_empty.png b/interface/web/themes/default-v2/icons/x16/printer_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1a0095674818d22d5274e0a55df4eba6100723d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/printer_empty.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/printer_small.png b/interface/web/themes/default-v2/icons/x16/printer_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f0a1a2c14b1a2917f375e6e7dba93f3684e214a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/printer_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle.png b/interface/web/themes/default-v2/icons/x16/puzzle.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c23fe16ebeb1b8f3d0680d3dbc7de4c212f7eca
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/puzzle.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle__arrow.png b/interface/web/themes/default-v2/icons/x16/puzzle__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e6fe76262d44c1130bd120c3566736cd66df941
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/puzzle__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle__exclamation.png b/interface/web/themes/default-v2/icons/x16/puzzle__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6de645498e674ed901fc2e04b3150f952e25f82
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/puzzle__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle__minus.png b/interface/web/themes/default-v2/icons/x16/puzzle__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..07d7752c0a9429275c3687dba9cfafb863134892
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/puzzle__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle__pencil.png b/interface/web/themes/default-v2/icons/x16/puzzle__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..19aa952fb87ed1cb7aa66014f9d71443025101f2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/puzzle__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle__plus.png b/interface/web/themes/default-v2/icons/x16/puzzle__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bf14aef5e736c61ec4b32f530cbbc3ea665d715
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/puzzle__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/puzzle_disable.png b/interface/web/themes/default-v2/icons/x16/puzzle_disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..d39db2e72f3e66e9f5782cf67f21610d038c6a5b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/puzzle_disable.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/question.png b/interface/web/themes/default-v2/icons/x16/question.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a55b01d538d8a0a0f6141ddade9c1c480899c15
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/question.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/question_frame.png b/interface/web/themes/default-v2/icons/x16/question_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..d15b7ecc78989b6bed1a8b2f321d1072fa4ca203
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/question_frame.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/question_shield.png b/interface/web/themes/default-v2/icons/x16/question_shield.png
new file mode 100644
index 0000000000000000000000000000000000000000..71f274c9f3db1354f2df6fe1f06ad28d2e4751e5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/question_shield.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/question_small.png b/interface/web/themes/default-v2/icons/x16/question_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbb8aa523e506079344445eae941eaeb0222508f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/question_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt.png b/interface/web/themes/default-v2/icons/x16/receipt.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c628d7769e04c070fe414811621682e2a2b2321
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipt.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_arrow.png b/interface/web/themes/default-v2/icons/x16/receipt_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..d165747871866152574d196c87b3f84d35d42d82
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipt_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_exclamation.png b/interface/web/themes/default-v2/icons/x16/receipt_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..c96861c968bf919eb118fb7d283f6c1876956273
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipt_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_minus.png b/interface/web/themes/default-v2/icons/x16/receipt_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d8f20fb467e466efffee7f1360dcbc21fc1237e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipt_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_pencil.png b/interface/web/themes/default-v2/icons/x16/receipt_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..af6dde02f874ba478cb401cd4d303268e331b255
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipt_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_plus.png b/interface/web/themes/default-v2/icons/x16/receipt_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3a0912c8ad929a8eec7eccffea0cf794ead8cfa
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipt_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_shred.png b/interface/web/themes/default-v2/icons/x16/receipt_shred.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e3c8f114ccd72d733e9c9d08cb8038555d895bd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipt_shred.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipt_text.png b/interface/web/themes/default-v2/icons/x16/receipt_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d33918e5cb1f5d3ae18cfe6afd6f0cc3b3ff4d4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipt_text.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts.png b/interface/web/themes/default-v2/icons/x16/receipts.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c72af536a0d78c210d7a8f291e7e6182b158697
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipts.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_arrow.png b/interface/web/themes/default-v2/icons/x16/receipts_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f25344387caff5a8a03a5eacd216f3e775910a11
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipts_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_exclamation.png b/interface/web/themes/default-v2/icons/x16/receipts_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..10da4a9617b1616e325e6c2ca3e3cdbcb4e37b22
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipts_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_minus.png b/interface/web/themes/default-v2/icons/x16/receipts_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d343b4a6c067a213e06e1c97a8aaa3addb2b958e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipts_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_pencil.png b/interface/web/themes/default-v2/icons/x16/receipts_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4bb3676a80def2f4b6f0af2572ced3689af0cee
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipts_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_plus.png b/interface/web/themes/default-v2/icons/x16/receipts_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..662ae0413a354f0ba7b595747111f6a2f97d3805
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipts_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/receipts_text.png b/interface/web/themes/default-v2/icons/x16/receipts_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e395e3b896bd4541175c0a13ec9e94f402f4f79
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/receipts_text.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/report.png b/interface/web/themes/default-v2/icons/x16/report.png
new file mode 100644
index 0000000000000000000000000000000000000000..d618d9fa0d3e80eb29a754e8f3e222f943f9ea43
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/report.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/report_arrow.png b/interface/web/themes/default-v2/icons/x16/report_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..340dbb49ae05d59e59c91aed41e9765701b74b34
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/report_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/report_exclamation.png b/interface/web/themes/default-v2/icons/x16/report_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..98359382b1a722497e2bd6de71c0ca5a156a0858
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/report_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/report_minus.png b/interface/web/themes/default-v2/icons/x16/report_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e168b3181ec61e0d23f08c486ffba92fe9d0b16
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/report_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/report_pencil.png b/interface/web/themes/default-v2/icons/x16/report_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..8473dbefb27d5aa6954adb8e22f26ca5f54fb440
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/report_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/report_plus.png b/interface/web/themes/default-v2/icons/x16/report_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..49b99950cd9cbc243d30b7216973160de73cf961
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/report_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler.png b/interface/web/themes/default-v2/icons/x16/ruler.png
new file mode 100644
index 0000000000000000000000000000000000000000..806c3d06629637ed94c05f980d6b6616f8694185
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ruler.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler__arrow.png b/interface/web/themes/default-v2/icons/x16/ruler__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..446046130d682bb899b3bec2da33f334117910e9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ruler__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler__exclamation.png b/interface/web/themes/default-v2/icons/x16/ruler__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..df09b53ba3ee5176473d60405fb704a44e4399b2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ruler__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler__minus.png b/interface/web/themes/default-v2/icons/x16/ruler__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9d6ce856a0976bff928855c533e5553a95d6dc5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ruler__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler__pencil.png b/interface/web/themes/default-v2/icons/x16/ruler__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cec26b479b501b4e8345e29fae5a34769c55f21
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ruler__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler__plus.png b/interface/web/themes/default-v2/icons/x16/ruler__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..0dabd9c137dce2fbbf23b3daa4b604e3e7aab9db
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ruler__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ruler_crop.png b/interface/web/themes/default-v2/icons/x16/ruler_crop.png
new file mode 100644
index 0000000000000000000000000000000000000000..931fec6529061b6d74d1374d5f58fb0b63a64b8a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ruler_crop.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe.png b/interface/web/themes/default-v2/icons/x16/safe.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa15852d060af62ea488b4c0944e762f67cb42bf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/safe.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe_arrow.png b/interface/web/themes/default-v2/icons/x16/safe_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9dd1b512c0f23cad58ff69442e2b7fd1623c66d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/safe_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe_exclamation.png b/interface/web/themes/default-v2/icons/x16/safe_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..dda4b8a16cdc7ba7b12422ad065ecaf0164eca69
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/safe_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe_minus.png b/interface/web/themes/default-v2/icons/x16/safe_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d3f4b7693d83418e37320831085883cb7ab1460
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/safe_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe_pencil.png b/interface/web/themes/default-v2/icons/x16/safe_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..45eeb426bb5c3ca8f22da3ffdd2c8a9ed1b22d63
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/safe_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/safe_plus.png b/interface/web/themes/default-v2/icons/x16/safe_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6721431c6eb37fba73a9b029a2b5c7e31a72a8ec
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/safe_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver.png b/interface/web/themes/default-v2/icons/x16/screwdriver.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad69f58c54334b0073b0c854be3dd0f23af32ecd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/screwdriver.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver_arrow.png b/interface/web/themes/default-v2/icons/x16/screwdriver_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c5374899623cc1b83917fd68a2790566e562448
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/screwdriver_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver_exclamation.png b/interface/web/themes/default-v2/icons/x16/screwdriver_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..d35224afdc82e7e29c4c6ddefb98f50b985b4ddb
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/screwdriver_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver_minus.png b/interface/web/themes/default-v2/icons/x16/screwdriver_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9b780d3c2eedebfac2a69308d429b168e4441d0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/screwdriver_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver_pencil.png b/interface/web/themes/default-v2/icons/x16/screwdriver_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..c745d7ce8a588901b81636139306f141c7b5bc7e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/screwdriver_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/screwdriver_plus.png b/interface/web/themes/default-v2/icons/x16/screwdriver_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8fbbaee3ca0492e5548de3b373e6a15a74017b2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/screwdriver_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/script.png b/interface/web/themes/default-v2/icons/x16/script.png
new file mode 100644
index 0000000000000000000000000000000000000000..672c3c92e31e891258b13557310e998b2acb0571
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/script.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/script__arrow.png b/interface/web/themes/default-v2/icons/x16/script__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..462eeecb7236952691439fdd8c7c4496e046e22b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/script__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/script__exclamation.png b/interface/web/themes/default-v2/icons/x16/script__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..5296a607c219e1bd2d091073af6f04b277ffb331
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/script__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/script__minus.png b/interface/web/themes/default-v2/icons/x16/script__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..126ecff575eaef61a9511b11a60126d5b69fc7fe
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/script__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/script__pencil.png b/interface/web/themes/default-v2/icons/x16/script__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfc36a7808fe64b6eae7ef1d46e57d2d96723ca2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/script__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/script__plus.png b/interface/web/themes/default-v2/icons/x16/script__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6a4934519bfb0b09c7c538a67628e709347004f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/script__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/script_code.png b/interface/web/themes/default-v2/icons/x16/script_code.png
new file mode 100644
index 0000000000000000000000000000000000000000..04cb7019960e6e1e6ba90b9fb46d7e1e6297dd14
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/script_code.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts.png b/interface/web/themes/default-v2/icons/x16/scripts.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36414febbf41eb43d79abcb865d2b2d0e329511
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/scripts.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts__arrow.png b/interface/web/themes/default-v2/icons/x16/scripts__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9adba7a9f27dbad0e1d3e190380028a0aeb44016
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/scripts__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts__exclamation.png b/interface/web/themes/default-v2/icons/x16/scripts__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..dec43e245ec83ed4f987e0fe031122589a8003f9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/scripts__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts__minus.png b/interface/web/themes/default-v2/icons/x16/scripts__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cc3666cfd22dcc92a74b66172139f4836577c9f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/scripts__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts__pencil.png b/interface/web/themes/default-v2/icons/x16/scripts__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..616d55501021a2f43480f52ce8c5a62bb573a60e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/scripts__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts__plus.png b/interface/web/themes/default-v2/icons/x16/scripts__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..00bde07451603758ef41f4157bf597d8534c1e19
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/scripts__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/scripts_code.png b/interface/web/themes/default-v2/icons/x16/scripts_code.png
new file mode 100644
index 0000000000000000000000000000000000000000..15123f57538d3f144e159a4a4adaba12069d9e89
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/scripts_code.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield.png b/interface/web/themes/default-v2/icons/x16/shield.png
new file mode 100644
index 0000000000000000000000000000000000000000..085880b4b9401cd0e69cd5c0123e1c90ebb64090
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/shield.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield__arrow.png b/interface/web/themes/default-v2/icons/x16/shield__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b6457ec2d8a65ab09df12850a46f96aaecbc3c8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/shield__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield__exclamation.png b/interface/web/themes/default-v2/icons/x16/shield__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..704f4aebc01401435778a87259205ab5fc6b3016
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/shield__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield__minus.png b/interface/web/themes/default-v2/icons/x16/shield__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c0d04aa38a1657d3f3bb8c8b7301021bfa08284
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/shield__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield__pencil.png b/interface/web/themes/default-v2/icons/x16/shield__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..c717e4da62922eab93a6b84cd2796e3201c9980b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/shield__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield__plus.png b/interface/web/themes/default-v2/icons/x16/shield__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ea1cb9c5d2f66ae26cbd8e21e3342bd7303df05
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/shield__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/shield_disable.png b/interface/web/themes/default-v2/icons/x16/shield_disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2dc3c5a68bf9f1445ad7d1191dc749bb48477d2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/shield_disable.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/slash.png b/interface/web/themes/default-v2/icons/x16/slash.png
new file mode 100644
index 0000000000000000000000000000000000000000..f941cff72132c3895512fc7a426918704f8c6c9a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/slash.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/slash_small.png b/interface/web/themes/default-v2/icons/x16/slash_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1259eb2c2b1eb7bc553cb27acd2fe4c7e73ce30
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/slash_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket.png b/interface/web/themes/default-v2/icons/x16/socket.png
new file mode 100644
index 0000000000000000000000000000000000000000..640f225f4b253d5fee07ebac262e259898c94bce
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/socket.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket_arrow.png b/interface/web/themes/default-v2/icons/x16/socket_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..671342c8f99fa73d71c9a478b333e7dbe3f89b71
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/socket_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket_exclamation.png b/interface/web/themes/default-v2/icons/x16/socket_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f01300eccbd98a5b63ca63babda6ac1e42f1495
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/socket_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket_minus.png b/interface/web/themes/default-v2/icons/x16/socket_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dfeaaf4b2cebc5d891bed17b947a38ac15d51fd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/socket_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket_pencil.png b/interface/web/themes/default-v2/icons/x16/socket_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..e38a0d142f11a93fc408f61f77863b4efb23e0a0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/socket_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/socket_plus.png b/interface/web/themes/default-v2/icons/x16/socket_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..9854d70a03a154aeb130958e006f62343d2b7591
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/socket_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort.png b/interface/web/themes/default-v2/icons/x16/sort.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3d410e0e206b8cc837896448fc4ddf1230abe36
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort__arrow.png b/interface/web/themes/default-v2/icons/x16/sort__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9aa43cbaab5d19f6a0f39060ac55663fe96250d3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort__exclamation.png b/interface/web/themes/default-v2/icons/x16/sort__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f7aa3160b87ead9060a9b31d4d6aef28d2cf507
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort__minus.png b/interface/web/themes/default-v2/icons/x16/sort__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cec83208fe74199f1ae5dad2514486bc9eebc5e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort__pencil.png b/interface/web/themes/default-v2/icons/x16/sort__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bc1fae69acf397fed9a91b0c233924dea47b663
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort__plus.png b/interface/web/themes/default-v2/icons/x16/sort__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4e7fca1e0d5fdd20e2025e03bb703e2a086deef
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_alphabet.png b/interface/web/themes/default-v2/icons/x16/sort_alphabet.png
new file mode 100644
index 0000000000000000000000000000000000000000..92c4a9cf417626875a2b1f40e2e1b5c0b3e73d49
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort_alphabet.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_alphabet_descending.png b/interface/web/themes/default-v2/icons/x16/sort_alphabet_descending.png
new file mode 100644
index 0000000000000000000000000000000000000000..8dca34cfd1013acde472448e0ed612e6b2cdb80c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort_alphabet_descending.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_date.png b/interface/web/themes/default-v2/icons/x16/sort_date.png
new file mode 100644
index 0000000000000000000000000000000000000000..21e367c2aa0b5fe60080cb8ae331d495be3f2ea5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort_date.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_date_descending.png b/interface/web/themes/default-v2/icons/x16/sort_date_descending.png
new file mode 100644
index 0000000000000000000000000000000000000000..69217fa5337e8e124d1fc1c8d378d87aceee28fe
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort_date_descending.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_number.png b/interface/web/themes/default-v2/icons/x16/sort_number.png
new file mode 100644
index 0000000000000000000000000000000000000000..dce9aad5387c062b9c562f75afb934c028301ad3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort_number.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_number_descending.png b/interface/web/themes/default-v2/icons/x16/sort_number_descending.png
new file mode 100644
index 0000000000000000000000000000000000000000..eadec7c7e2d352ad36fe815fb8abfd8c172b44c3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort_number_descending.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_quantity.png b/interface/web/themes/default-v2/icons/x16/sort_quantity.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb2c1e33dd6158107762163e9dae20339184f8d3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort_quantity.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_quantity_descending.png b/interface/web/themes/default-v2/icons/x16/sort_quantity_descending.png
new file mode 100644
index 0000000000000000000000000000000000000000..abacec96033f65ed210839cf4f8153b026d43ca1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort_quantity_descending.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sort_small.png b/interface/web/themes/default-v2/icons/x16/sort_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5cf900ebd27ffbcbca03e5f4a890eb90ef33912
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sort_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp.png b/interface/web/themes/default-v2/icons/x16/stamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca9475d3dc362d1e422533c0f2ec52e93be276a2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/stamp.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp_arrow.png b/interface/web/themes/default-v2/icons/x16/stamp_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..28e494064d698b204c58791a06f65c857664de86
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/stamp_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp_exclamation.png b/interface/web/themes/default-v2/icons/x16/stamp_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e6cf3062fa65153ca5f1d0983d6fb0227f83013
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/stamp_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp_minus.png b/interface/web/themes/default-v2/icons/x16/stamp_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..55582ff30b85dde5965216d4dbedb4a1bbbd1899
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/stamp_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp_pencil.png b/interface/web/themes/default-v2/icons/x16/stamp_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cd7319d116780378223a64d621e301d52c9819a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/stamp_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/stamp_plus.png b/interface/web/themes/default-v2/icons/x16/stamp_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3de4596947329410f695f2853fe9162ec1c5087
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/stamp_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/star.png b/interface/web/themes/default-v2/icons/x16/star.png
new file mode 100644
index 0000000000000000000000000000000000000000..a23dbdfe07d1c39fec6fe03984354c8b11b4b55b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/star.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/star__arrow.png b/interface/web/themes/default-v2/icons/x16/star__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..b011f0e81577403e0c7dd70f77060d144830ed0c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/star__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/star__exclamation.png b/interface/web/themes/default-v2/icons/x16/star__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..46a204de975b80fa72eb1e9103b65cf4121a7ec7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/star__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/star__minus.png b/interface/web/themes/default-v2/icons/x16/star__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d150e00d6a037a60b46336c6b92e067473d28552
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/star__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/star__pencil.png b/interface/web/themes/default-v2/icons/x16/star__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf0d77b16a2bc3934489d4b24f6cdaa82b4a2b4d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/star__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/star__plus.png b/interface/web/themes/default-v2/icons/x16/star__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f32f79793c36577d461d9be42499c333fc02c34
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/star__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/star_empty.png b/interface/web/themes/default-v2/icons/x16/star_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..019e358ddd97fd560ec9c1a421f8c94859ed11d9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/star_empty.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/star_half.png b/interface/web/themes/default-v2/icons/x16/star_half.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fdbd3759ed5c78aa8e0bc59db5b2f22149b60f9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/star_half.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/star_small.png b/interface/web/themes/default-v2/icons/x16/star_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1378cfe49a4639124b8f503bce0c538acf8cf47
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/star_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/star_small_empty.png b/interface/web/themes/default-v2/icons/x16/star_small_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcadeaa4c43d6fd2f14287603629454214cc9df2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/star_small_empty.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/star_small_half.png b/interface/web/themes/default-v2/icons/x16/star_small_half.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b1cb6d2c5415db202be45b0707b30bcaa37f1e7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/star_small_half.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note.png b/interface/web/themes/default-v2/icons/x16/sticky_note.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff9d467d72410b6173d0ed0fc86aa2dfb9b0b9a7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_note.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note__arrow.png b/interface/web/themes/default-v2/icons/x16/sticky_note__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..2488b94955d79991d653da2dd18a8f099255d5cd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_note__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note__exclamation.png b/interface/web/themes/default-v2/icons/x16/sticky_note__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..e201d16f6cc5fb836711cc56757bb5dcb6d9b29f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_note__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note__minus.png b/interface/web/themes/default-v2/icons/x16/sticky_note__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..56833a170bcd6411dd65489de5e1103d9202571b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_note__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note__pencil.png b/interface/web/themes/default-v2/icons/x16/sticky_note__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..83cebec94e5078d0f6dac6383e229485a38cb7ce
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_note__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note__plus.png b/interface/web/themes/default-v2/icons/x16/sticky_note__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6dcb51a09cd35c328831b00f5ddd0de7af6ac0c8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_note__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note_pin.png b/interface/web/themes/default-v2/icons/x16/sticky_note_pin.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e64b83415bb618b7bb4e4bb7c9de54a8b3331c7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_note_pin.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note_shred.png b/interface/web/themes/default-v2/icons/x16/sticky_note_shred.png
new file mode 100644
index 0000000000000000000000000000000000000000..934c3d834890e479dcdc380bfcb70a9bd1fe841c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_note_shred.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note_small.png b/interface/web/themes/default-v2/icons/x16/sticky_note_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ce81781a099c7ce54014ffb8590715ba3da685e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_note_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note_small_pin.png b/interface/web/themes/default-v2/icons/x16/sticky_note_small_pin.png
new file mode 100644
index 0000000000000000000000000000000000000000..67357e8a7d53f5831c6275fb551c23347c6ff275
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_note_small_pin.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_note_text.png b/interface/web/themes/default-v2/icons/x16/sticky_note_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..94d2e94d49d3f1feb76c14d78fe258bad4881336
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_note_text.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes.png b/interface/web/themes/default-v2/icons/x16/sticky_notes.png
new file mode 100644
index 0000000000000000000000000000000000000000..9940a558172ee87da276965ba9edce614d79f673
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_notes.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes__arrow.png b/interface/web/themes/default-v2/icons/x16/sticky_notes__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6451cfe6e60edfa498f691954f955bb7444ae7d1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_notes__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes__exclamation.png b/interface/web/themes/default-v2/icons/x16/sticky_notes__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..72aa718c43fd71720d20b5aacf5565f9fef6652c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_notes__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes__minus.png b/interface/web/themes/default-v2/icons/x16/sticky_notes__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..0197d57db5aa5cedc435baf5e20cd49664ed763f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_notes__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes__pencil.png b/interface/web/themes/default-v2/icons/x16/sticky_notes__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..afecdeeda04877387f171e3ee5da07268802a615
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_notes__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes__plus.png b/interface/web/themes/default-v2/icons/x16/sticky_notes__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6152db1cdea0e84a35e06ade5749d2aad7759f58
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_notes__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes_pin.png b/interface/web/themes/default-v2/icons/x16/sticky_notes_pin.png
new file mode 100644
index 0000000000000000000000000000000000000000..abe78e22c570347d7f211f3d976e115708df0373
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_notes_pin.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes_stack.png b/interface/web/themes/default-v2/icons/x16/sticky_notes_stack.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce4ae9bf3d715f88d6541585a42523fc3b350ec8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_notes_stack.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/sticky_notes_text.png b/interface/web/themes/default-v2/icons/x16/sticky_notes_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..2274943a9175318bfebac0cfdb07eed75d2bb936
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/sticky_notes_text.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch.png b/interface/web/themes/default-v2/icons/x16/switch.png
new file mode 100644
index 0000000000000000000000000000000000000000..d91ec21d1163b033130d33d2a8af1698c360aa08
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/switch.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch_arrow.png b/interface/web/themes/default-v2/icons/x16/switch_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c83fff291eed39cec5003950cc581bcc4eada07
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/switch_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch_exclamation.png b/interface/web/themes/default-v2/icons/x16/switch_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2e8e36badb2caa4e62e6ce9fa025d9189a96267
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/switch_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch_minus.png b/interface/web/themes/default-v2/icons/x16/switch_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d2e7d38c8ebe58593a39e00074b4461f06738aa
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/switch_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch_pencil.png b/interface/web/themes/default-v2/icons/x16/switch_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fd85c5c7cc72739ec8b100b70d89152a02d9ed7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/switch_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/switch_plus.png b/interface/web/themes/default-v2/icons/x16/switch_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a81d6c36bdfaee9963f459d80d8df35df9378015
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/switch_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/table.png b/interface/web/themes/default-v2/icons/x16/table.png
new file mode 100644
index 0000000000000000000000000000000000000000..9deb778b8b0dcd449c20c1ebaf4b0b75a00a2ac4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/table.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/table__arrow.png b/interface/web/themes/default-v2/icons/x16/table__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..31122510ab561e1123b52b1ea6e5a8d3874baad1
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/table__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/table__exclamation.png b/interface/web/themes/default-v2/icons/x16/table__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a5d0c87efbb26f2eb72ccd52a5bb4677dcfd252
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/table__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/table__minus.png b/interface/web/themes/default-v2/icons/x16/table__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff295443bdfde471fc38b929a886e8791beded82
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/table__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/table__pencil.png b/interface/web/themes/default-v2/icons/x16/table__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..e17739c2c9c016959c534e5b11cf56e3dcfb8d4b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/table__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/table__plus.png b/interface/web/themes/default-v2/icons/x16/table__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1a918d87fee20225459eabed0d61ac4ca5f0c23
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/table__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/table_delete.png b/interface/web/themes/default-v2/icons/x16/table_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..f67ac0d5649835a2f6578412bc0fdfd827e9e091
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/table_delete.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/table_delete_column.png b/interface/web/themes/default-v2/icons/x16/table_delete_column.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8721c36a9526ae95257128706d21387fb26f035
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/table_delete_column.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/table_insert.png b/interface/web/themes/default-v2/icons/x16/table_insert.png
new file mode 100644
index 0000000000000000000000000000000000000000..5be705b7cad78650b83bb4defffd8eb5b36152b8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/table_insert.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/table_insert_column.png b/interface/web/themes/default-v2/icons/x16/table_insert_column.png
new file mode 100644
index 0000000000000000000000000000000000000000..4348fb6ad7dcf49c4fb6a37d28eccdf7650eab5c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/table_insert_column.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables.png b/interface/web/themes/default-v2/icons/x16/tables.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0eb51f90ca3f764e0c745ccbf9b7e90ce2d1739
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tables.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_arrow.png b/interface/web/themes/default-v2/icons/x16/tables_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..c364e6956e5e08b2bb484126fe7d1fa6f425c302
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tables_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_exclamation.png b/interface/web/themes/default-v2/icons/x16/tables_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..faad227f26ce96cd0f555d49ac222b112402bb02
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tables_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_minus.png b/interface/web/themes/default-v2/icons/x16/tables_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d166635372033dbe7963cfe364900df9a76d9cdf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tables_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_pencil.png b/interface/web/themes/default-v2/icons/x16/tables_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2c107c52ce96f5af1184f892b307b72219ce5a9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tables_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_plus.png b/interface/web/themes/default-v2/icons/x16/tables_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..56d6bd5ac0a206f456de359375ec7f2c26bbbf51
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tables_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tables_stacks.png b/interface/web/themes/default-v2/icons/x16/tables_stacks.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7e9e871655705422889ec073bc36414296f80fc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tables_stacks.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag.png b/interface/web/themes/default-v2/icons/x16/tag.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcc294569b1d019f79614ff7e2d9792cc62c8382
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tag.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag__arrow.png b/interface/web/themes/default-v2/icons/x16/tag__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d88ddaeadc291b97c0c14497edf193e55fc583a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tag__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag__exclamation.png b/interface/web/themes/default-v2/icons/x16/tag__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b0b38afe9ee9264cf983cd729e0ed367d992cd6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tag__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag__minus.png b/interface/web/themes/default-v2/icons/x16/tag__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5df09a80d91c7df986163db21de85ee301b0a8dc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tag__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag__pencil.png b/interface/web/themes/default-v2/icons/x16/tag__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..94921f6e5e4189ae5d50359062245429d8e53c8d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tag__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag__plus.png b/interface/web/themes/default-v2/icons/x16/tag__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..8014448ebc0dcc2bc425a3da2a30cda8105ad29f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tag__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag_label.png b/interface/web/themes/default-v2/icons/x16/tag_label.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2dc2e037f928077b803eacdf653d1e7bdacac0c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tag_label.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tag_small.png b/interface/web/themes/default-v2/icons/x16/tag_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..69e01163b72e57d3a48088f904fde740389fc2e0
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tag_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags.png b/interface/web/themes/default-v2/icons/x16/tags.png
new file mode 100644
index 0000000000000000000000000000000000000000..d06ba8bcc8ae628478fdee10c8bc84770990de8f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tags.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags__arrow.png b/interface/web/themes/default-v2/icons/x16/tags__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..8647dbf2ce6559b7c87fee71091935e6605abc9d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tags__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags__exclamation.png b/interface/web/themes/default-v2/icons/x16/tags__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d0e27f84832c73c8294ae59d2e479a5d455164c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tags__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags__minus.png b/interface/web/themes/default-v2/icons/x16/tags__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9692628e973a66c8c514593ed0d4c95abd286cb
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tags__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags__pencil.png b/interface/web/themes/default-v2/icons/x16/tags__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..20c2bc59b61230b4727a7115ae8be2b1489244ee
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tags__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags__plus.png b/interface/web/themes/default-v2/icons/x16/tags__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa7b68516c5b58a2745a346bcaf19e575e4a0b56
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tags__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tags_label.png b/interface/web/themes/default-v2/icons/x16/tags_label.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9a02448ced12c8615c7589db32cf2afbd4f8a85
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tags_label.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick.png b/interface/web/themes/default-v2/icons/x16/tick.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d89b351515619a1342026edff245f3dbbc903c2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tick.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick_circle.png b/interface/web/themes/default-v2/icons/x16/tick_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..26b2d5ad86831ec0c067d7f304112ed25548a5cd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tick_circle.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick_circle_frame.png b/interface/web/themes/default-v2/icons/x16/tick_circle_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..92282dca54b60c527f860c2c08ac0ca53454775e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tick_circle_frame.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick_shield.png b/interface/web/themes/default-v2/icons/x16/tick_shield.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfdaf4e79636301419a37e12bf0c592bd8688d50
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tick_shield.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick_small.png b/interface/web/themes/default-v2/icons/x16/tick_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc72367b2bd351e15fa377d8d01a9a917c571677
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tick_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tick_small_circle.png b/interface/web/themes/default-v2/icons/x16/tick_small_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..37ef5cdfab0c1baad72eeb465c6d02853ecf6608
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tick_small_circle.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket.png b/interface/web/themes/default-v2/icons/x16/ticket.png
new file mode 100644
index 0000000000000000000000000000000000000000..543ee24206a64a661fe0f25d970788ae6c2a0402
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ticket.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_arrow.png b/interface/web/themes/default-v2/icons/x16/ticket_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe6e698d6614d430543b70aa2d28313953db5c7a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ticket_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_exclamation.png b/interface/web/themes/default-v2/icons/x16/ticket_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9b2d1c379aa12b4b66d20fe6b12f8b8a709e22d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ticket_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_minus.png b/interface/web/themes/default-v2/icons/x16/ticket_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..f82a363f8ab926e320b50496352fba86f6a86ecc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ticket_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_pencil.png b/interface/web/themes/default-v2/icons/x16/ticket_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..b795e5f71f773a4558d5ef59530de01c1ed040c9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ticket_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_plus.png b/interface/web/themes/default-v2/icons/x16/ticket_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..63439302a5fed3bf79f53914ca575685ce78a5a5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ticket_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/ticket_small.png b/interface/web/themes/default-v2/icons/x16/ticket_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..01dd7bfba41e31caf786e1cf6450bd11ece201f5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/ticket_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy.png b/interface/web/themes/default-v2/icons/x16/trophy.png
new file mode 100644
index 0000000000000000000000000000000000000000..747b6b1562ecfed69e35164622f58b3c4e0e2ebf
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/trophy.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy_arrow.png b/interface/web/themes/default-v2/icons/x16/trophy_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..61777f7ec2c4cb19e6ae27b05245b5a5402437f5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/trophy_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy_exclamation.png b/interface/web/themes/default-v2/icons/x16/trophy_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b12dbe470f65f67bbdee9288bd4ce8d79671fd6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/trophy_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy_minus.png b/interface/web/themes/default-v2/icons/x16/trophy_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..29147431ffa1f212563db2fc8f921470270b7ffd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/trophy_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy_pencil.png b/interface/web/themes/default-v2/icons/x16/trophy_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..3990eee8ff826309501eab568f5f11cc441f50e3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/trophy_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/trophy_plus.png b/interface/web/themes/default-v2/icons/x16/trophy_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b351302796d82195d726328699a235f1a8195c3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/trophy_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/tux.png b/interface/web/themes/default-v2/icons/x16/tux.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e6d9d85143278b2362a0ac631ad8f5b217f1536
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/tux.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user.png b/interface/web/themes/default-v2/icons/x16/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e051f3c4262f4600a376f03fa68c3ae132b0adb
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_add.png b/interface/web/themes/default-v2/icons/x16/user_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d84550327293a4fc45f2ed5bde73a0c333d31d8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user_add.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_comment.png b/interface/web/themes/default-v2/icons/x16/user_comment.png
new file mode 100644
index 0000000000000000000000000000000000000000..34405692b2adc733b3e6eaf47959a739916e7e7e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user_comment.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_delete.png b/interface/web/themes/default-v2/icons/x16/user_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..95792e2bd515fe3eb5d6fef3112cf34cc6b8f1c5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user_delete.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_edit.png b/interface/web/themes/default-v2/icons/x16/user_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..b26a1caf0952af8f442e8c32e446775ed08413e9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user_edit.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_female.png b/interface/web/themes/default-v2/icons/x16/user_female.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c7293e86bd11287a3336788cedb03ce7686f1ed
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user_female.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_go.png b/interface/web/themes/default-v2/icons/x16/user_go.png
new file mode 100644
index 0000000000000000000000000000000000000000..868ed2889b67e68dd5a75d061add3a5dd4918804
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user_go.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_gray.png b/interface/web/themes/default-v2/icons/x16/user_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b4a507a0007c2d7237c9450d344eb51877ad155
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user_gray.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_green.png b/interface/web/themes/default-v2/icons/x16/user_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..264381ed231b9b8bb751be7d8dbff44cf472fbe6
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user_green.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_orange.png b/interface/web/themes/default-v2/icons/x16/user_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4fee607d06a34f682b0696ea8da9ec5d5355888
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user_orange.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_red.png b/interface/web/themes/default-v2/icons/x16/user_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..165bc9cc2161236edbb1e53c44015458e754e00e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user_red.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/user_suit.png b/interface/web/themes/default-v2/icons/x16/user_suit.png
new file mode 100644
index 0000000000000000000000000000000000000000..44d0db7d5a9cc7ffdf9120004e35c2102149505a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/user_suit.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/vcard.png b/interface/web/themes/default-v2/icons/x16/vcard.png
new file mode 100644
index 0000000000000000000000000000000000000000..767f4988bcfc24f99f26e0d18fe176cdd9ff2e58
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/vcard.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/vcard_add.png b/interface/web/themes/default-v2/icons/x16/vcard_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd9d4144f151aa75c44c5462f150baf34c2e2e47
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/vcard_add.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/vcard_delete.png b/interface/web/themes/default-v2/icons/x16/vcard_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c944dd9f37c785b135949d06a1f24bd9cbc9d13
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/vcard_delete.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/vcard_edit.png b/interface/web/themes/default-v2/icons/x16/vcard_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7026e7731020f14ed8d1bb0f051e758e45f8b5f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/vcard_edit.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall.png b/interface/web/themes/default-v2/icons/x16/wall.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a1ea1684ba6f9bc95b388eeef259f70131ca071
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wall.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall__arrow.png b/interface/web/themes/default-v2/icons/x16/wall__arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0ebdffed6ac9da27a9f6dd3fedc5d5279f0bc0e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wall__arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall__exclamation.png b/interface/web/themes/default-v2/icons/x16/wall__exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..96e59b3234b71b58bc0cf3e19d095ccbce374d16
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wall__exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall__minus.png b/interface/web/themes/default-v2/icons/x16/wall__minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f4dd35be97337fbfeaa1b923095ff31f03d8eb3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wall__minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall__pencil.png b/interface/web/themes/default-v2/icons/x16/wall__pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ba4414a70fafe5a3fd52e3bbd19dbb98bf50692
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wall__pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall__plus.png b/interface/web/themes/default-v2/icons/x16/wall__plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cc0acedbab1f78b3cea27993c592f97e865e85d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wall__plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall_brick.png b/interface/web/themes/default-v2/icons/x16/wall_brick.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b7d70adfa135695775b8ceac3a22920e4aefc1d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wall_brick.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall_disable.png b/interface/web/themes/default-v2/icons/x16/wall_disable.png
new file mode 100644
index 0000000000000000000000000000000000000000..12b9dcaccde83fd3bb0ed010d702bb21bd9b5bce
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wall_disable.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall_small.png b/interface/web/themes/default-v2/icons/x16/wall_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d41e1e991c234cfd42e3bfbd7b03530de0e160d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wall_small.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wall_small_brick.png b/interface/web/themes/default-v2/icons/x16/wall_small_brick.png
new file mode 100644
index 0000000000000000000000000000000000000000..7293179be7952a688225f246dfffb7e08c2e782d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wall_small_brick.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet.png b/interface/web/themes/default-v2/icons/x16/wallet.png
new file mode 100644
index 0000000000000000000000000000000000000000..2632217942d22dfa0ddf6ada7dadddeca907459a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wallet.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet_arrow.png b/interface/web/themes/default-v2/icons/x16/wallet_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0ebf3b7f5f1fc490e2b6bad242f44200b14faba
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wallet_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet_exclamation.png b/interface/web/themes/default-v2/icons/x16/wallet_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6e0ff708ad69420080133903c3c8118e4cc93b8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wallet_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet_minus.png b/interface/web/themes/default-v2/icons/x16/wallet_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4945538c8e8300889c5e2fd8b0a64c7a59a80cb9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wallet_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet_pencil.png b/interface/web/themes/default-v2/icons/x16/wallet_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..0094fe55005b6fa4f083ff9fae70951e3c678c6b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wallet_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wallet_plus.png b/interface/web/themes/default-v2/icons/x16/wallet_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee68702740af25dcd1aac8a1982b575fc0bd12c9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wallet_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand.png b/interface/web/themes/default-v2/icons/x16/wand.png
new file mode 100644
index 0000000000000000000000000000000000000000..c07acca983133ad8cb8f8aedd71d9f5e767f38fd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wand.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand_arrow.png b/interface/web/themes/default-v2/icons/x16/wand_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a9c841188748ebe95c7d85b89dac40e5a4cf192
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wand_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand_exclamation.png b/interface/web/themes/default-v2/icons/x16/wand_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea33f5ef99fd7beba3bfcbdc1ff0373bdb443495
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wand_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand_minus.png b/interface/web/themes/default-v2/icons/x16/wand_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..1217278f55c8ea0a0ada9ef7368be172d9e0a13b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wand_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand_pencil.png b/interface/web/themes/default-v2/icons/x16/wand_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dfa9452a0dc64a0dbda40fc2b74dc1b71541764
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wand_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wand_plus.png b/interface/web/themes/default-v2/icons/x16/wand_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9ac4f0c5d40b0495a703ae72ecfef0e6957b38f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wand_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench.png b/interface/web/themes/default-v2/icons/x16/wrench.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c01122da620532336f7742f6d524356605d469c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wrench.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_arrow.png b/interface/web/themes/default-v2/icons/x16/wrench_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..77f2f3ea3278a4c55617129a2ba94f26ac3df916
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wrench_arrow.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_exclamation.png b/interface/web/themes/default-v2/icons/x16/wrench_exclamation.png
new file mode 100644
index 0000000000000000000000000000000000000000..597b5229ef4ae759d7f54c59262cbb4147fbd060
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wrench_exclamation.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_minus.png b/interface/web/themes/default-v2/icons/x16/wrench_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0ac40e395c8af052fa10f35599a0369a2bab1dc
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wrench_minus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_pencil.png b/interface/web/themes/default-v2/icons/x16/wrench_pencil.png
new file mode 100644
index 0000000000000000000000000000000000000000..937788a6fe16a582cac4b85790f2c38d21c018ec
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wrench_pencil.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_plus.png b/interface/web/themes/default-v2/icons/x16/wrench_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c187f255fab2a22783606fa7cdfddcc928349c20
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wrench_plus.png differ
diff --git a/interface/web/themes/default-v2/icons/x16/wrench_screwdriver.png b/interface/web/themes/default-v2/icons/x16/wrench_screwdriver.png
new file mode 100644
index 0000000000000000000000000000000000000000..123eec587ecbae490f92e354eb9fdd03c01285ad
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x16/wrench_screwdriver.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/calculator.png b/interface/web/themes/default-v2/icons/x32/calculator.png
new file mode 100644
index 0000000000000000000000000000000000000000..703031eea066640b72ae09e59bccabdd65124ff9
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/calculator.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/client.png b/interface/web/themes/default-v2/icons/x32/client.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c9b5dc52d355fe67c9ef66bc26ee630610c363d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/client.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/dashboard.png b/interface/web/themes/default-v2/icons/x32/dashboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..240d3a2bad9989406171fe2546b439ec6259366e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/dashboard.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/dns.png b/interface/web/themes/default-v2/icons/x32/dns.png
new file mode 100644
index 0000000000000000000000000000000000000000..03e63b060048b3bcbb3e3aba8c98bc4a9ee5d582
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/dns.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/domain.png b/interface/web/themes/default-v2/icons/x32/domain.png
new file mode 100644
index 0000000000000000000000000000000000000000..f829d2cba2731923565b46a1011d206083f638a3
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/domain.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/drawer.png b/interface/web/themes/default-v2/icons/x32/drawer.png
new file mode 100644
index 0000000000000000000000000000000000000000..f94f6b68f13f7d2b0658c0f8af8af72077340ce8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/drawer.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/email.png b/interface/web/themes/default-v2/icons/x32/email.png
new file mode 100644
index 0000000000000000000000000000000000000000..27706144ec8420945b3862e3a54db3487c928af8
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/email.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/help.png b/interface/web/themes/default-v2/icons/x32/help.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6a7afa49b744b630166c00cbafc140c82e9cb4f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/help.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/login.png b/interface/web/themes/default-v2/icons/x32/login.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e81f556f71b42d7d3709d625e62fd3a3dfb3260
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/login.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/monitor.png b/interface/web/themes/default-v2/icons/x32/monitor.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee733761f28ac55a35c071025de9d7aa2368c82e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/monitor.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/network.png b/interface/web/themes/default-v2/icons/x32/network.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfafc0455ba97124dd0017170469d03b86c31ddd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/network.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/server.png b/interface/web/themes/default-v2/icons/x32/server.png
new file mode 100644
index 0000000000000000000000000000000000000000..3471b9db5896781f9140d7d75d4cda6b91d8f3f4
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/server.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/sites.png b/interface/web/themes/default-v2/icons/x32/sites.png
new file mode 100644
index 0000000000000000000000000000000000000000..64ea1b6b3b157dd0713987d48a2221def290145a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/sites.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_critical.png b/interface/web/themes/default-v2/icons/x32/state_critical.png
new file mode 100644
index 0000000000000000000000000000000000000000..caeed331ff3d6e1c2cea29e11fa901cd7b45afd5
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/state_critical.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_error.png b/interface/web/themes/default-v2/icons/x32/state_error.png
new file mode 100644
index 0000000000000000000000000000000000000000..112a2642efd7f30452023a28f7322cc58195e482
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/state_error.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_info.png b/interface/web/themes/default-v2/icons/x32/state_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..91bd218e010df070e17f9a62c1ba49cb92a5378c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/state_info.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_ok.png b/interface/web/themes/default-v2/icons/x32/state_ok.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4a896407af1935b8134e2954e342a9aacda938a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/state_ok.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_unknown.png b/interface/web/themes/default-v2/icons/x32/state_unknown.png
new file mode 100644
index 0000000000000000000000000000000000000000..22c034b882d56bf963b26f316d2e53ab21842cf2
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/state_unknown.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/state_warning.png b/interface/web/themes/default-v2/icons/x32/state_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3e7c1f84328559138c81c38930fee5dac0b1509
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/state_warning.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/system.png b/interface/web/themes/default-v2/icons/x32/system.png
new file mode 100644
index 0000000000000000000000000000000000000000..136083cda434d388bc1483154f43a2abb9fae67a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/system.png differ
diff --git a/interface/web/themes/default-v2/icons/x32/tools.png b/interface/web/themes/default-v2/icons/x32/tools.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe1e27c4221a1bd366c2ea5f4f4632a86088575b
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x32/tools.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/client.png b/interface/web/themes/default-v2/icons/x64/client.png
new file mode 100644
index 0000000000000000000000000000000000000000..96e74e76cf7e8cefa3d39d4bc5375ba32730d3c7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/client.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/dashboard.png b/interface/web/themes/default-v2/icons/x64/dashboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfad21a2bd765ffd3daee3a67c61c2e9da39c260
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/dashboard.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/dns.png b/interface/web/themes/default-v2/icons/x64/dns.png
new file mode 100644
index 0000000000000000000000000000000000000000..b40b5376fa076b0ccef987f465c923dd2336e59f
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/dns.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/domain.png b/interface/web/themes/default-v2/icons/x64/domain.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e2884e46c160400b7cbf93215c80a60be1d4fcd
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/domain.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/drawer.png b/interface/web/themes/default-v2/icons/x64/drawer.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fe3c1bb693b0d11aa9e1aac02b894fc880626d7
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/drawer.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/email.png b/interface/web/themes/default-v2/icons/x64/email.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6c1c51365d4ccb5d1bb718f31ee85dbfd3d542e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/email.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/help.png b/interface/web/themes/default-v2/icons/x64/help.png
new file mode 100644
index 0000000000000000000000000000000000000000..4909e62824880873a33afa5ca553dc206f373743
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/help.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/login.png b/interface/web/themes/default-v2/icons/x64/login.png
new file mode 100644
index 0000000000000000000000000000000000000000..27adf0b5e5ec4f14c5f6c5364cb2ec3080ed3a2a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/login.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/monitor.png b/interface/web/themes/default-v2/icons/x64/monitor.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6fc9370956e29fa0c94422d5d3dcf18b20a8e8c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/monitor.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/network.png b/interface/web/themes/default-v2/icons/x64/network.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9aa4a22980d781de7a6a80f75c192d93703c55a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/network.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/server.png b/interface/web/themes/default-v2/icons/x64/server.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcde9dcc5ca190c446b86ae32be731dc2e712f1a
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/server.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/sites.png b/interface/web/themes/default-v2/icons/x64/sites.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6e6ca252615a6b71b3b6bf43325d28eb91dd38e
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/sites.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/system.png b/interface/web/themes/default-v2/icons/x64/system.png
new file mode 100644
index 0000000000000000000000000000000000000000..efb2008ee53939e6b70ee5ecedf0b1c0c033226c
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/system.png differ
diff --git a/interface/web/themes/default-v2/icons/x64/tools.png b/interface/web/themes/default-v2/icons/x64/tools.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ce4e231f9a04031f28fef8efe47f4baa23d851d
Binary files /dev/null and b/interface/web/themes/default-v2/icons/x64/tools.png differ
diff --git a/interface/web/themes/default-v2/images/ajax-loader.gif b/interface/web/themes/default-v2/images/ajax-loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7c4804ebcaec27b830873a1ff4d157f1bde00ef1
Binary files /dev/null and b/interface/web/themes/default-v2/images/ajax-loader.gif differ
diff --git a/interface/web/themes/default-v2/images/buttonHolder_bg.gif b/interface/web/themes/default-v2/images/buttonHolder_bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..45dc0da38b2608cf1bb0c5079105e8a8bbfbe95b
Binary files /dev/null and b/interface/web/themes/default-v2/images/buttonHolder_bg.gif differ
diff --git a/interface/web/themes/default-v2/images/chevron.png b/interface/web/themes/default-v2/images/chevron.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca05879425ec644442a7590157616f4de3eb77d
Binary files /dev/null and b/interface/web/themes/default-v2/images/chevron.png differ
diff --git a/interface/web/themes/default-v2/images/favicon.ico b/interface/web/themes/default-v2/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..da6257c84cce5c550eb7118581ed2a22f15af248
Binary files /dev/null and b/interface/web/themes/default-v2/images/favicon.ico differ
diff --git a/interface/web/themes/default-v2/images/header_bg.png b/interface/web/themes/default-v2/images/header_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..f53a8b4ac206d253510634b56d55eaf87d9801d4
Binary files /dev/null and b/interface/web/themes/default-v2/images/header_bg.png differ
diff --git a/interface/web/themes/default-v2/images/header_logo.png b/interface/web/themes/default-v2/images/header_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d85333a5af3d21da5fefc6b0fa2e052ac489501d
Binary files /dev/null and b/interface/web/themes/default-v2/images/header_logo.png differ
diff --git a/interface/web/themes/default-v2/images/lists_tfoot_bg.png b/interface/web/themes/default-v2/images/lists_tfoot_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe3acffe5946346a67b39082457c784d33bce9bb
Binary files /dev/null and b/interface/web/themes/default-v2/images/lists_tfoot_bg.png differ
diff --git a/interface/web/themes/default-v2/images/lists_thead_bg.png b/interface/web/themes/default-v2/images/lists_thead_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..c75d17f03e19525bdc5117c08072e4c5d056e68b
Binary files /dev/null and b/interface/web/themes/default-v2/images/lists_thead_bg.png differ
diff --git a/interface/web/themes/default-v2/images/meter_bg.gif b/interface/web/themes/default-v2/images/meter_bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6b38c6e9592c2624c5f2d763ec9892ed550108ab
Binary files /dev/null and b/interface/web/themes/default-v2/images/meter_bg.gif differ
diff --git a/interface/web/themes/default-v2/images/screen_bg.png b/interface/web/themes/default-v2/images/screen_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cfb14945604c4b43b8cdb22485e1dc1f58b43b3
Binary files /dev/null and b/interface/web/themes/default-v2/images/screen_bg.png differ
diff --git a/interface/web/themes/default-v2/licences.txt b/interface/web/themes/default-v2/licences.txt
new file mode 100644
index 0000000000000000000000000000000000000000..edfe14672d79ad1ccdc8167ddc28ea020c74d27a
--- /dev/null
+++ b/interface/web/themes/default-v2/licences.txt
@@ -0,0 +1,11 @@
+Theme created by Martin Henne (red-ray.de)
+
+based on:
+
+Templates: http://www.yaml.de
+Web-Forms: http://www.sprawsm.com/uni-form/
+Icons: http://www.pinvoke.com and http://www.randomjabber.com/static/sizcons
+Know-How: http://particletree.com/features/rediscovering-the-button-element
+
+
+Major restructuring by Christian Foellmann (Foe-Services.de)
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/firewall_edit.htm b/interface/web/themes/default-v2/templates/admin/firewall_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..827c1c8b9f29a18ff24d585f23e4b623f38dc468
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/firewall_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_firewall">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="tcp_port">{tmpl_var name='tcp_port_txt'}</label>
+                <input name="tcp_port" id="tcp_port" value="{tmpl_var name='tcp_port'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="udp_port">{tmpl_var name='udp_port_txt'}</label>
+                <input name="udp_port" id="udp_port" value="{tmpl_var name='udp_port'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/firewall_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/firewall_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/firewall_list.htm b/interface/web/themes/default-v2/templates/admin/firewall_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..d209a45882908bf19cd44bc16e37c2bea5e396a5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/firewall_list.htm
@@ -0,0 +1,60 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_firewall">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/firewall_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_tcp_port" scope="col"><tmpl_var name="tcp_port_txt"></th>
+                        <th class="tbl_col_udp_port" scope="col"><tmpl_var name="udp_port_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_tcp_port"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
+                        <td class="tbl_col_udp_port"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_tcp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tcp_port"}</a></td>
+                            <td class="tbl_col_udp_port"><a href="#" onClick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="udp_port"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                    <tr>
+                    <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/groups_edit.htm b/interface/web/themes/default-v2/templates/admin/groups_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b5fe764944a33b13731b35b32e77b22682c9deee
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/groups_edit.htm
@@ -0,0 +1,26 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_groups">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="description">{tmpl_var name='description_txt'}</label>
+                <textarea name="description" id="description" rows='5' cols='30'>{tmpl_var name='description'}</textarea>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/groups_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/groups_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/groups_list.htm b/interface/web/themes/default-v2/templates/admin/groups_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..3fc1918ec70af360daad66048bb2de1a8557165a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/groups_list.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_groups">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/groups_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+                <p><tmpl_var name="warning_txt"></p>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                            <td class="tbl_col_description"><a href="#" onClick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/iptables_edit.htm b/interface/web/themes/default-v2/templates/admin/iptables_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..87033ab2c1ed2dda09589a353b0bf891ee4cdb36
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/iptables_edit.htm
@@ -0,0 +1,67 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+<div class="panel panel_iptables">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="table">{tmpl_var name='table_txt'}</label>
+                <select name="table" id="table" class="selectInput formLengthLimit">
+                    {tmpl_var name='table'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="protocol">{tmpl_var name='protocol_txt'}</label>
+                <select name="protocol" id="protocol" class="selectInput formLengthLimit">
+                    {tmpl_var name='protocol'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="singleport">{tmpl_var name='singleport_txt'}</label>
+                <input name="singleport" id="singleport" value="{tmpl_var name='singleport'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="multiport">{tmpl_var name='multiport_txt'}</label>
+                <input name="multiport" id="multiport" value="{tmpl_var name='multiport'}" size="20" maxlength="40" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination_ip">{tmpl_var name='destination_ip_txt'}</label>
+                <input name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="source_ip">{tmpl_var name='source_ip_txt'}</label>
+                <input name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="state">{tmpl_var name='state_txt'}</label>
+                <input name="state" id="state" value="{tmpl_var name='state'}" size="16" maxlength="20" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="target">{tmpl_var name='target_txt'}</label>
+                <select name="target" id="target" class="selectInput formLengthLimit">
+                    {tmpl_var name='target'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/iptables_edit.php');">
+                <span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/iptables_list.php');">
+                <span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div> 
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/iptables_list.htm b/interface/web/themes/default-v2/templates/admin/iptables_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..37878f9da1d3fb12f89952f85a21bafbdcc77497
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/iptables_list.htm
@@ -0,0 +1,73 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_iptables">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>Tools</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/iptables_edit.php');">
+                    <span>{tmpl_var name="add_new_rule_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_table" scope="col"><tmpl_var name="table_txt"></th>
+                        <th class="tbl_col_protocol" scope="col"><tmpl_var name="protocol_txt"></th>
+                        <th class="tbl_col_port" scope="col"><tmpl_var name="singleport_txt"></th>
+                        <th class="tbl_col_port" scope="col"><tmpl_var name="multiport_txt"></th>
+                        <th class="tbl_col_state" scope="col"><tmpl_var name="state_txt"></th>
+                        <th class="tbl_col_target" scope="col"><tmpl_var name="target_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_table"></td>
+                        <td class="tbl_col_protocol"><select name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
+                        <td class="tbl_col_singleport"></td>
+                        <td class="tbl_col_multiport"></td>
+                        <td class="tbl_col_state"></td>
+                        <td class="tbl_col_target"><select name="search_target">{tmpl_var name='search_target'}</select></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons">
+                                <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/iptables_list.php');"><span>{tmpl_var name="filter_txt"}filter_txt</span></button>
+                            </div>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_table"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="table"}</a></td>
+                            <td class="tbl_col_protocol"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="protocol"}</a></td>
+                            <td class="tbl_col_singleport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="singleport"}</a></td>
+                            <td class="tbl_col_multiport"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="multiport"}</a></td>
+                            <td class="tbl_col_state"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="state"}</a></td>
+                            <td class="tbl_col_target"><a href="#" onClick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="target"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/iptables_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="9"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/language_add.htm b/interface/web/themes/default-v2/templates/admin/language_add.htm
new file mode 100644
index 0000000000000000000000000000000000000000..540fc97657fedc314ac9f3fa9c811fbee6ee17a8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_add.htm
@@ -0,0 +1,29 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_add">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Language Add</legend>
+            <div class="ctrlHolder">
+                <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
+                <select name="lng_select" id="language" class="selectInput flags">
+                    {tmpl_var name='language_option'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="lng_new">{tmpl_var name='language_new_txt'}</label>
+                <input name="lng_new" id="lng_new" value="" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+                <p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_add.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/language_complete.htm b/interface/web/themes/default-v2/templates/admin/language_complete.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7416a7096c8eaa837dd687361e5bb6b9c0b350d7
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_complete.htm
@@ -0,0 +1,29 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_complete">
+
+    <tmpl_if name="msg">
+        <div id="OKMsg"><tmpl_var name="msg"></div>
+    </tmpl_if>
+    <tmpl_if name="error">
+        <div id="errorMsg"><tmpl_var name="error"></div>
+    </tmpl_if>
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Language Complete</legend>
+            <div class="ctrlHolder">
+                <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
+                <select name="lng_select" id="language" class="selectInput flags">
+                    {tmpl_var name='language_option'}
+                </select>
+            </div>
+        </fieldset>
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_complete.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/language_edit.htm b/interface/web/themes/default-v2/templates/admin/language_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..3767a178ebf6c9df20ed0cb9d14911cb2b60d7c2
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_edit.htm
@@ -0,0 +1,29 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_edit">
+
+    <div class="pnl_formsarea">
+        <fieldset id="wf_area_language_edit"><legend>Language File Edit: {tmpl_var name="file_path"}</legend>
+            <span class="wf_oneField">
+                <tmpl_loop name="records">
+                    <span class="wf_oneField">
+                        <label for="records[{tmpl_var name="key"}]" class="wf_preField">{tmpl_var name="key"}</label>
+                        <input type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" size="50" >
+                    </span> 
+                </tmpl_loop>
+            </span>
+        </fieldset>  
+                
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="lang" value="{tmpl_var name='lang'}">
+        <input type="hidden" name="lang_file" value="{tmpl_var name='lang_file'}">
+        <input type="hidden" name="module" value="{tmpl_var name='module'}">
+            
+        <div class="wf_actions buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php?lng_select={tmpl_var name='lang'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>     
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/language_export.htm b/interface/web/themes/default-v2/templates/admin/language_export.htm
new file mode 100644
index 0000000000000000000000000000000000000000..40856220c9ca1698c25ef8b91ed815ab5ab87f2d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_export.htm
@@ -0,0 +1,31 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_export">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Language Export</legend>
+            <div class="ctrlHolder">
+                <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
+                <select name="lng_select" id="lng_select" class="selectInput flags">
+                    {tmpl_var name='language_option'}
+                </select>
+            </div>
+                
+                
+            <tmpl_if name="msg">
+                <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+            </tmpl_if>
+                
+            <input type="hidden" name="id" value="{tmpl_var name='id'}">
+                
+            <div class="buttonHolder buttons">
+                <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/language_export.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+                <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            </div>
+                
+        </fieldset>
+            
+    </div>
+  
+</div>
diff --git a/interface/web/themes/default-v2/templates/admin/language_import.htm b/interface/web/themes/default-v2/templates/admin/language_import.htm
new file mode 100644
index 0000000000000000000000000000000000000000..30289448f2c666f5ceca1567d75ef5f80bfc4c6b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_import.htm
@@ -0,0 +1,44 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Language Import</legend>
+            <div class="ctrlHolder">
+                <label for="lng_select">{tmpl_var name='language_import_txt'}</label>
+                <input name="file" id="file" size="30" type="file" class="fileUpload" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='language_overwrite_txt'}</p>
+                <div class="multiField">
+                    <input id="overwrite" type="checkbox" value="1" name="overwrite"/>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ignore_version_txt'}</p>
+                <div class="multiField">
+                    <input id="ignore_version" type="checkbox" value="1" name="ignore_version"/>
+                </div>
+            </div>
+                
+                
+            <tmpl_if name="msg">
+                <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+            </tmpl_if>
+            <tmpl_if name="error">
+                <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+            </tmpl_if>
+                
+            <input type="hidden" name="id" value="{tmpl_var name='id'}">
+                
+            <div class="buttonHolder buttons">
+                <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitUploadForm('pageForm','admin/language_import.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+                <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            </div>
+                
+        </fieldset>
+            
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/language_list.htm b/interface/web/themes/default-v2/templates/admin/language_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..d2689535d3ef67540d85bfce002e5b217ebd211a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/language_list.htm
@@ -0,0 +1,47 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_groups">
+
+    <div class="pnl_toolsarea">
+        <fieldset class="inlineLabels"><legend>Tools</legend>
+            <div class="buttons">
+                <div class="ctrlHolder">
+                    <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
+                    <select name="lng_select" id="language" class="selectInput flags" onChange="submitForm('pageForm','admin/language_list.php');">
+                        {tmpl_var name='language_option'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+  
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_module" scope="col"><tmpl_var name="module_txt"></th>
+                        <th class="tbl_col_lang_file" scope="col"><tmpl_var name="lang_file_txt"></th>
+                        <th class="tbl_col_limit" scope="col"><tmpl_var name="lang_file_date_txt"></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_module"><a href="#" onClick="loadContent('admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}');">{tmpl_var name="module"}</a></td>
+                            <td class="tbl_col_lang_file"><a href="#" onClick="loadContent('admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}');">{tmpl_var name="lang_file"}</a></td>
+                            <td><a href="#" onClick="loadContent('admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}');">{tmpl_var name="lang_file_date"}</a></td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/remote_action_ispcupdate.htm b/interface/web/themes/default-v2/templates/admin/remote_action_ispcupdate.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6c903bad7c9eb4d6996128fc4683d06b1583cfe3
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/remote_action_ispcupdate.htm
@@ -0,0 +1,33 @@
+<!--
+<h2><tmpl_var name="do_ispcupdate_caption"></h2>
+<p><tmpl_var name="do_ispcupdate_desc"></p>
+-->
+
+<h2><tmpl_var name="ispconfig_update_title"></h2>
+<p style="margin-top:50px; font-size:14px;"><tmpl_var name="ispconfig_update_text"></p>
+
+<div class="panel panel_language_add">
+  
+    <div class="pnl_formsarea">
+        <!--
+          <fieldset class="inlineLabels"><legend>{tmpl_var name='do_ispcupdate_caption'}</legend>
+            <div class="ctrlHolder">
+              <label for="server_select">{tmpl_var name='select_server_txt'}</label>
+              <select name="server_select" id="server" class="selectInput" onchange="document.getElementById('OKMsg').style.visibility = 'hidden'; ">
+                                              {tmpl_var name='server_option'}
+                                      </select>
+            </div>
+          </fieldset>
+      
+              <tmpl_if name="msg">
+              <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+        </tmpl_if>
+      
+      
+                <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_do_txt'}" onClick="submitForm('pageForm','admin/remote_action_ispcupdate.php');"><span>{tmpl_var name='btn_do_txt'}</span></button>
+          </div>
+        -->
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/remote_action_osupdate.htm b/interface/web/themes/default-v2/templates/admin/remote_action_osupdate.htm
new file mode 100644
index 0000000000000000000000000000000000000000..034947355f307531eb0bf029d0458dc6019a8d30
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/remote_action_osupdate.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="do_osupdate_caption"></h2>
+<p><tmpl_var name="do_osupdate_desc"></p>
+
+<div class="panel panel_language_add">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='do_osupdate_caption'}</legend>
+            <div class="ctrlHolder">
+                <label for="server_select">{tmpl_var name='select_server_txt'}</label>
+                <select name="server_select" id="server" class="selectInput" onchange="document.getElementById('OKMsg').style.visibility = 'hidden'; ">
+                    {tmpl_var name='server_option'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <tmpl_if name="msg">
+            <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+        </tmpl_if>
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_do_txt'}" onClick="submitForm('pageForm','admin/remote_action_osupdate.php');"><span>{tmpl_var name='btn_do_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/remote_user_edit.htm b/interface/web/themes/default-v2/templates/admin/remote_user_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..8bdb61f7313d341eb145e2a3638bb87e459ad1ca
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/remote_user_edit.htm
@@ -0,0 +1,47 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_ftp_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="remote_username">{tmpl_var name='username_txt'}</label>
+                <p class="prefix">{tmpl_var name='username_prefix'}</p>
+                <input name="remote_username" id="username" value="{tmpl_var name='remote_username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+                
+            <div class="ctrlHolder">
+                <label for="remote_password">{tmpl_var name='password_txt'}</label>
+                <input name="remote_password" id="password" value="{tmpl_var name='remote_password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='function_txt'}</p>
+                <div class="multiField">
+                    &nbsp; {tmpl_var name='remote_functions'}
+                </div>
+            </div>
+                
+        </fieldset>
+            
+        <input type="hidden" name="remote_userid" value="{tmpl_var name='id'}">
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/remote_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/remote_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/remote_user_list.htm b/interface/web/themes/default-v2/templates/admin/remote_user_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..12937b27c243ae2582eb61c2f082c4435c7eb645
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/remote_user_list.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+<div class="panel panel_list_users">
+    
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/remote_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+    
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_remote_userid" scope="col"><tmpl_var name="parent_remote_userid_txt"></th>
+                        <th class="tbl_col_remote_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_remote_userid"></td>           
+                        <td class="tbl_col_remote_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/remote_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_remote_userid"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_userid"}</a></td>
+                            <td class="tbl_col_remote_username"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_username"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_cron_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_cron_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..17c811ba27d27fa0905a03aeabd82911e26427dd
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_cron_edit.htm
@@ -0,0 +1,30 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="init_script">{tmpl_var name='init_script_txt'}</label>
+                <input name="init_script" id="init_script" value="{tmpl_var name='init_script'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="crontab_dir">{tmpl_var name='crontab_dir_txt'}</label>
+                <input name="crontab_dir" id="crontab_dir" value="{tmpl_var name='crontab_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="wget">{tmpl_var name='wget_txt'}</label>
+                <input name="wget" id="wget" value="{tmpl_var name='wget'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_dns_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_dns_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c308ec495c1e97433bdf9934d260c7dbf6d2aff9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_dns_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="bind_user">{tmpl_var name='bind_user_txt'}</label>
+                <input name="bind_user" id="bind_user" value="{tmpl_var name='bind_user'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bind_group">{tmpl_var name='bind_group_txt'}</label>
+                <input name="bind_group" id="bind_group" value="{tmpl_var name='bind_group'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bind_zonefiles_dir">{tmpl_var name='bind_zonefiles_dir_txt'}</label>
+                <input name="bind_zonefiles_dir" id="bind_zonefiles_dir" value="{tmpl_var name='bind_zonefiles_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="named_conf_path">{tmpl_var name='named_conf_path_txt'}</label>
+                <input name="named_conf_path" id="named_conf_path" value="{tmpl_var name='named_conf_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="named_conf_local_path">{tmpl_var name='named_conf_local_path_txt'}</label>
+                <input name="named_conf_local_path" id="named_conf_local_path" value="{tmpl_var name='named_conf_local_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_fastcgi_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_fastcgi_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ad9444060a562b34e3c11b6a4234a8573a437f78
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_fastcgi_edit.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="fastcgi_starter_path">{tmpl_var name='fastcgi_starter_path_txt'}</label>
+                <input name="fastcgi_starter_path" id="fastcgi_starter_path" value="{tmpl_var name='fastcgi_starter_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_starter_script">{tmpl_var name='fastcgi_starter_script_txt'}</label>
+                <input name="fastcgi_starter_script" id="fastcgi_starter_script" value="{tmpl_var name='fastcgi_starter_script'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_alias">{tmpl_var name='fastcgi_alias_txt'}</label>
+                <input name="fastcgi_alias" id="fastcgi_alias" value="{tmpl_var name='fastcgi_alias'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_phpini_path">{tmpl_var name='fastcgi_phpini_path_txt'}</label>
+                <input name="fastcgi_phpini_path" id="fastcgi_phpini_path" value="{tmpl_var name='fastcgi_phpini_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_children">{tmpl_var name='fastcgi_children_txt'}</label>
+                <input name="fastcgi_children" id="fastcgi_children" value="{tmpl_var name='fastcgi_children'}" size="40" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_max_requests">{tmpl_var name='fastcgi_max_requests_txt'}</label>
+                <input name="fastcgi_max_requests" id="fastcgi_max_requests" value="{tmpl_var name='fastcgi_max_requests'}" size="40" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_bin">{tmpl_var name='fastcgi_bin_txt'}</label>
+                <input name="fastcgi_bin" id="fastcgi_bin" value="{tmpl_var name='fastcgi_bin'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fastcgi_config_syntax">{tmpl_var name='fastcgi_config_syntax_txt'}</label>
+                <select name="fastcgi_config_syntax" id="fastcgi_config_syntax" class="selectInput">
+                    {tmpl_var name='fastcgi_config_syntax'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_getmail_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_getmail_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..21492e4c8983ad35b783078406aaf39239dc4fe7
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_getmail_edit.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="getmail_config_dir">{tmpl_var name='getmail_config_dir_txt'}</label>
+                <input name="getmail_config_dir" id="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_jailkit_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_jailkit_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..19e0416e616606688b5c01e9a5d710f72f06693c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_jailkit_edit.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="jailkit_chroot_home">{tmpl_var name='jailkit_chroot_home_txt'}</label>
+                <input name="jailkit_chroot_home" id="jailkit_chroot_home" value="{tmpl_var name='jailkit_chroot_home'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="jailkit_chroot_app_sections">{tmpl_var name='jailkit_chroot_app_sections_txt'}</label>
+                <input name="jailkit_chroot_app_sections" id="jailkit_chroot_app_sections" value="{tmpl_var name='jailkit_chroot_app_sections'}" size="40" maxlength="1000" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="jailkit_chroot_app_programs">{tmpl_var name='jailkit_chroot_app_programs_txt'}</label>
+                <input name="jailkit_chroot_app_programs" id="jailkit_chroot_app_programs" value="{tmpl_var name='jailkit_chroot_app_programs'}" size="40" maxlength="1000" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="jailkit_chroot_cron_programs">{tmpl_var name='jailkit_chroot_cron_programs_txt'}</label>
+                <input name="jailkit_chroot_cron_programs" id="jailkit_chroot_cron_programs" value="{tmpl_var name='jailkit_chroot_cron_programs'}" size="40" maxlength="1000" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_list.htm b/interface/web/themes/default-v2/templates/admin/server_config_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..1f5356b94b78e596f81e6b20e11824a453351ba5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_list.htm
@@ -0,0 +1,40 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_server_config">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_name"><a href="#" onClick="loadContent('admin/server_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_mail_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_mail_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..72292b32bf8c35987308ace171d16ab39c6b331e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_mail_edit.htm
@@ -0,0 +1,94 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="module">{tmpl_var name='module_txt'}</label>
+                <select name="module" id="module" class="selectInput formLengthHalf">
+                    {tmpl_var name='module'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="maildir_path">{tmpl_var name='maildir_path_txt'}</label>
+                <input name="maildir_path" id="maildir_path" value="{tmpl_var name='maildir_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="homedir_path">{tmpl_var name='homedir_path_txt'}</label>
+                <input name="homedir_path" id="homedir_path" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='pop3_imap_daemon_txt'}</p>
+                <div class="multiField">
+                    <select name="pop3_imap_daemon" id="pop3_imap_daemon" class="selectInput">
+                        {tmpl_var name='pop3_imap_daemon'}
+                    </select>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mail_filter_syntax_txt'}</p>
+                <div class="multiField">
+                    <select name="mail_filter_syntax" id="mail_filter_syntax" class="selectInput">
+                        {tmpl_var name='mail_filter_syntax'}
+                    </select>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailuser_uid">{tmpl_var name='mailuser_uid_txt'}</label>
+                <input name="mailuser_uid" id="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailuser_gid">{tmpl_var name='mailuser_gid_txt'}</label>
+                <input name="mailuser_gid" id="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailuser_name">{tmpl_var name='mailuser_name_txt'}</label>
+                <input name="mailuser_name" id="mailuser_name" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailuser_group">{tmpl_var name='mailuser_group_txt'}</label>
+                <input name="mailuser_group" id="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="relayhost">{tmpl_var name='relayhost_txt'}</label>
+                <input name="relayhost" id="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="relayhost_user">{tmpl_var name='relayhost_user_txt'}</label>
+                <input name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="relayhost_password">{tmpl_var name='relayhost_password_txt'}</label>
+                <input name="relayhost_password" id="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255" type="password" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailbox_size_limit">{tmpl_var name='mailbox_size_limit_txt'}</label>
+                <input name="mailbox_size_limit" id="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15" type="text" class="textInput formLengthLimit" />&nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="message_size_limit">{tmpl_var name='message_size_limit_txt'}</label>
+                <input name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15" type="text" class="textInput formLengthLimit" />&nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mailbox_quota_stats_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='mailbox_quota_stats'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="realtime_blackhole_list">{tmpl_var name='realtime_blackhole_list_txt'}</label>
+                <input name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='realtime_blackhole_list_note_txt'}
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_rescue_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_rescue_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0310344013350332e44211cdfea7a8af2be6159c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_rescue_edit.htm
@@ -0,0 +1,44 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Rescue</legend>
+            <div class="ctrlHolder">
+                <p class="label" style="width:300px">{tmpl_var name='try_rescue_txt'}</p>
+                <div class="multiField" style="width:100px">
+                    {tmpl_var name='try_rescue'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_httpd_txt'}</p>
+                <div class="multiField" style="width:100px">
+                    {tmpl_var name='do_not_try_rescue_httpd'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mysql_txt'}</p>
+                <div class="multiField" style="width:100px">
+                    {tmpl_var name='do_not_try_rescue_mysql'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mail_txt'}</p>
+                <div class="multiField" style="width:100px">
+                    {tmpl_var name='do_not_try_rescue_mail'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <tmpl_var name="rescue_description_txt">
+            
+            <input type="hidden" name="id" value="{tmpl_var name='id'}">
+                
+            <div class="buttonHolder buttons">
+                <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+                <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_server_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_server_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..3cb6848164e66c4cce70bebbfb38300f5b0e6abd
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_server_edit.htm
@@ -0,0 +1,67 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='auto_network_configuration_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='auto_network_configuration'} {tmpl_var name='network_config_warning_txt'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+                <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="netmask">{tmpl_var name='netmask_txt'}</label>
+                <input name="netmask" id="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="gateway">{tmpl_var name='gateway_txt'}</label>
+                <input name="gateway" id="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="hostname">{tmpl_var name='hostname_txt'}</label>
+                <input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="nameservers">{tmpl_var name='nameservers_txt'}</label>
+                <input name="nameservers" id="nameservers" value="{tmpl_var name='nameservers'}" size="40" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='nameservers_hint_txt'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="firewall">{tmpl_var name='firewall_txt'}</label>
+                <select name="firewall" id="firewall" class="selectInput">
+                    {tmpl_var name='firewall'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="loglevel">{tmpl_var name='loglevel_txt'}</label>
+                <select name="loglevel" id="loglevel" class="selectInput">
+                    {tmpl_var name='loglevel'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="backup_dir">{tmpl_var name='backup_dir_txt'}</label>
+                <input name="backup_dir" id="backup_dir" value="{tmpl_var name='backup_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="backup_mode">{tmpl_var name='backup_mode_txt'}</label>
+                <select name="backup_mode" id="backup_mode" class="selectInput">
+                    {tmpl_var name='backup_mode'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_ufw_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_ufw_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e0a1ded29df3d054e9cbd9aeba2fc6a6957a3cdc
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_ufw_edit.htm
@@ -0,0 +1,66 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>UFW Firewall</legend>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ufw_enable_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ufw_enable'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ufw_manage_builtins_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ufw_manage_builtins'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ufw_ipv6_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ufw_ipv6'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ufw_default_input_policy">{tmpl_var name='ufw_default_input_policy_txt'}</label>
+                <select name="ufw_default_input_policy" id="ufw_default_input_policy" class="selectInput">
+                    {tmpl_var name='ufw_default_input_policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ufw_default_output_policy">{tmpl_var name='ufw_default_output_policy_txt'}</label>
+                <select name="ufw_default_output_policy" id="ufw_default_output_policy" class="selectInput">
+                    {tmpl_var name='ufw_default_output_policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ufw_default_forward_policy">{tmpl_var name='ufw_default_forward_policy_txt'}</label>
+                <select name="ufw_default_forward_policy" id="ufw_default_forward_policy" class="selectInput">
+                    {tmpl_var name='ufw_default_forward_policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ufw_default_application_policy">{tmpl_var name='ufw_default_application_policy_txt'}</label>
+                <select name="ufw_default_application_policy" id="ufw_default_application_policy" class="selectInput">
+                    {tmpl_var name='ufw_default_application_policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ufw_log_level">{tmpl_var name='ufw_log_level_txt'}</label>
+                <select name="ufw_log_level" id="ufw_log_level" class="selectInput">
+                    {tmpl_var name='ufw_log_level'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_vlogger_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_vlogger_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c960fb131aa620e97134721202eca1d4f8556587
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_vlogger_edit.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="config_dir">{tmpl_var name='config_dir_txt'}</label>
+                <input name="config_dir" id="config_dir" value="{tmpl_var name='config_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..fecd3dcedb1345c198479c11b5773803de8135a4
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
@@ -0,0 +1,240 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='server_type_txt'}</p>
+                <div class="multiField">
+                    <select name="server_type" id="server_type" class="selectInput">
+                        {tmpl_var name='server_type'}
+                    </select>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="website_basedir">{tmpl_var name='website_basedir_txt'}</label>
+                <input name="website_basedir" id="website_basedir" value="{tmpl_var name='website_basedir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="website_path">{tmpl_var name='website_path_txt'}</label>
+                <input name="website_path" id="website_path" value="{tmpl_var name='website_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="website_symlinks">{tmpl_var name='website_symlinks_txt'}</label>
+                <input name="website_symlinks" id="website_symlinks" value="{tmpl_var name='website_symlinks'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="website_symlinks_rel">{tmpl_var name='website_symlinks_rel_txt'}</label>
+                <div class="multiField">
+                    {tmpl_var name='website_symlinks_rel'}
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="vhost_conf_dir">{tmpl_var name='vhost_conf_dir_txt'}</label>
+                <input name="vhost_conf_dir" id="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="vhost_conf_enabled_dir">{tmpl_var name='vhost_conf_enabled_dir_txt'}</label>
+                <input name="vhost_conf_enabled_dir" id="vhost_conf_enabled_dir" value="{tmpl_var name='vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_vhost_conf_dir">{tmpl_var name='nginx_vhost_conf_dir_txt'}</label>
+                <input name="nginx_vhost_conf_dir" id="nginx_vhost_conf_dir" value="{tmpl_var name='nginx_vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_vhost_conf_enabled_dir">{tmpl_var name='nginx_vhost_conf_enabled_dir_txt'}</label>
+                <input name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='security_level_txt'}</p>
+                <div class="multiField">
+                    <select name="security_level" id="security_level" class="selectInput">
+                        {tmpl_var name='security_level'}
+                    </select>
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <p class="label">{tmpl_var name='check_apache_config_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='check_apache_config'}
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="user">{tmpl_var name='web_user_txt'}</label>
+                <input name="user" id="user" value="{tmpl_var name='user'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="group">{tmpl_var name='web_group_txt'}</label>
+                <input name="group" id="group" value="{tmpl_var name='group'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_user">{tmpl_var name='nginx_user_txt'}</label>
+                <input name="nginx_user" id="nginx_user" value="{tmpl_var name='nginx_user'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_group">{tmpl_var name='nginx_group_txt'}</label>
+                <input name="nginx_group" id="nginx_group" value="{tmpl_var name='nginx_group'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_cgi_socket">{tmpl_var name='nginx_cgi_socket_txt'}</label>
+                <input name="nginx_cgi_socket" id="nginx_cgi_socket" value="{tmpl_var name='nginx_cgi_socket'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="htaccess_allow_override">{tmpl_var name='htaccess_allow_override_txt'}</label>
+                <input name="htaccess_allow_override" id="htaccess_allow_override" value="{tmpl_var name='htaccess_allow_override'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='enable_ip_wildcard_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='enable_ip_wildcard'}
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='enable_sni_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='enable_sni'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
+                    <input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="CA_pass">{tmpl_var name='CA_pass_txt'}</label>
+                    <input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" class="textInput" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='permissions_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='set_folder_permissions_on_update_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='set_folder_permissions_on_update'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='web_folder_protection_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='web_folder_protection'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='add_web_users_to_sshusers_group_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='add_web_users_to_sshusers_group'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='connect_userid_to_webid_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='connect_userid_to_webid'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="connect_userid_to_webid_start">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
+                    <input name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='php_settings_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder apache">
+                    <label for="php_ini_path_apache">{tmpl_var name='php_ini_path_apache_txt'}</label>
+                    <input name="php_ini_path_apache" id="php_ini_path_apache" value="{tmpl_var name='php_ini_path_apache'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder apache">
+                    <label for="php_ini_path_cgi">{tmpl_var name='php_ini_path_cgi_txt'}</label>
+                    <input name="php_ini_path_cgi" id="php_ini_path_cgi" value="{tmpl_var name='php_ini_path_cgi'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_fpm_init_script">{tmpl_var name='php_fpm_init_script_txt'}</label>
+                    <input name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_fpm_ini_path">{tmpl_var name='php_fpm_ini_path_txt'}</label>
+                    <input name="php_fpm_ini_path" id="php_fpm_ini_path" value="{tmpl_var name='php_fpm_ini_path'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_fpm_pool_dir">{tmpl_var name='php_fpm_pool_dir_txt'}</label>
+                    <input name="php_fpm_pool_dir" id="php_fpm_pool_dir" value="{tmpl_var name='php_fpm_pool_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_fpm_start_port">{tmpl_var name='php_fpm_start_port_txt'}</label>
+                    <input name="php_fpm_start_port" id="php_fpm_start_port" value="{tmpl_var name='php_fpm_start_port'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_fpm_socket_dir">{tmpl_var name='php_fpm_socket_dir_txt'}</label>
+                    <input name="php_fpm_socket_dir" id="php_fpm_socket_dir" value="{tmpl_var name='php_fpm_socket_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
+                    <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="40" type="text" class="textInput" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='apps_vhost_settings_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="apps_vhost_port">{tmpl_var name='apps_vhost_port_txt'}</label>
+                    <input name="apps_vhost_port" id="apps_vhost_port" value="{tmpl_var name='apps_vhost_port'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="apps_vhost_ip">{tmpl_var name='apps_vhost_ip_txt'}</label>
+                    <input name="apps_vhost_ip" id="apps_vhost_ip" value="{tmpl_var name='apps_vhost_ip'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="apps_vhost_servername">{tmpl_var name='apps_vhost_servername_txt'}</label>
+                    <input name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='awstats_settings_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="awstats_conf_dir">{tmpl_var name='awstats_conf_dir_txt'}</label>
+                    <input name="awstats_conf_dir" id="awstats_conf_dir" value="{tmpl_var name='awstats_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="awstats_data_dir">{tmpl_var name='awstats_data_dir_txt'}</label>
+                    <input name="awstats_data_dir" id="awstats_data_dir" value="{tmpl_var name='awstats_data_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="awstats_pl">{tmpl_var name='awstats_pl_txt'}</label>
+                    <input name="awstats_pl" id="awstats_pl" value="{tmpl_var name='awstats_pl'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="awstats_buildstaticpages_pl">{tmpl_var name='awstats_buildstaticpages_pl_txt'}</label>
+                    <input name="awstats_buildstaticpages_pl" id="awstats_buildstaticpages_pl" value="{tmpl_var name='awstats_buildstaticpages_pl'}" size="40" maxlength="255" type="text" class="textInput" />
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    var serverType = jQuery('#server_type').val();
+    jQuery('#server_type').replaceWith('<label for="server_Type">'+serverType+'</label><input type="hidden" name="server_type" value="'+serverType+'">');
+    adjustForm();
+    jQuery('#server_type').change(function(){
+        serverType = $(this).val();
+        adjustForm();
+    });
+    
+    function adjustForm(){
+        if(serverType == "nginx"){
+            jQuery('.nginx').show();
+            jQuery('.apache').hide();
+        } else {
+            jQuery('.nginx').hide();
+            jQuery('.apache').show();
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_edit_config.htm b/interface/web/themes/default-v2/templates/admin/server_edit_config.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5e23924112b6971b6f27609a3869e442e372d8a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_edit_config.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="config">{tmpl_var name='config_txt'}</label>
+                <textarea name="config" id="config" rows='20' cols='40'>{tmpl_var name='config'}</textarea>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_edit_services.htm b/interface/web/themes/default-v2/templates/admin/server_edit_services.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f6e47323c29a8fedefa4e6b2b4077eb140638dad
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_edit_services.htm
@@ -0,0 +1,70 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_name">{tmpl_var name='server_name_txt'}</label>
+                <input name="server_name" id="server_name" value="{tmpl_var name='server_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mail_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='mail_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='web_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='web_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='dns_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='dns_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='file_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='file_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='db_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='db_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='vserver_server_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='vserver_server'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="mirror_server_id">{tmpl_var name='mirror_server_id_txt'}</label>
+                <select name="mirror_server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='mirror_server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="active">{tmpl_var name='active_txt'}</label>
+                <select name="active" id="active" class="selectInput formLengthBool">
+                    {tmpl_var name='active'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_ip_edit.htm b/interface/web/themes/default-v2/templates/admin/server_ip_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..35718ceed855cfeae73f8a9da6e11b4e6e8feee6
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_ip_edit.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_ip">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>IP Address</legend>
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="client_id">{tmpl_var name='client_id_txt'}</label>
+                <select name="client_id" id="client_id" class="selectInput">
+                    {tmpl_var name='client_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ip_type">{tmpl_var name='ip_type_txt'}</label>
+                <select name="ip_type" id="ip_type" class="selectInput">
+                    {tmpl_var name='ip_type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+                <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='virtualhost_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='virtualhost'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="virtualhost_port">{tmpl_var name='virtualhost_port_txt'}</label>
+                <input name="virtualhost_port" id="virtualhost_port" value="{tmpl_var name='virtualhost_port'}" size="15" maxlength="15" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_ip_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_ip_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_ip_list.htm b/interface/web/themes/default-v2/templates/admin/server_ip_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..4234e00a971fb3447cb2118ec91e36b074a69c22
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_ip_list.htm
@@ -0,0 +1,64 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_server_ip">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_ip_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_ip_type" scope="col"><tmpl_var name="ip_type_txt"></th>
+                        <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
+                        <th class="tbl_col_virtualhost" scope="col"><tmpl_var name="virtualhost_txt"></th>
+                        <th class="tbl_col_virtualhost_port" scope="col"><tmpl_var name="virtualhost_port_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+                        <td class="tbl_col_ip_type"><select name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td>
+                        <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
+                        <td class="tbl_col_virtualhost"><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
+                        <td class="tbl_col_virtualhost_port"><input type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_ip_type"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_type"}</a></td>
+                            <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
+                            <td class="tbl_col_virtualhost"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost"}</a></td>
+                            <td class="tbl_col_virtualhost_port"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost_port"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_list.htm b/interface/web/themes/default-v2/templates/admin/server_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..078d262eb0ffca39216e5ffca6af16bd2ecc76e1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_server">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
+                        <th class="tbl_col_mail_server" scope="col"><tmpl_var name="mail_server_txt"></th>
+                        <th class="tbl_col_web_server" scope="col"><tmpl_var name="web_server_txt"></th>
+                        <th class="tbl_col_dns_server" scope="col"><tmpl_var name="dns_server_txt"></th>
+                        <th class="tbl_col_file_server" scope="col"><tmpl_var name="file_server_txt"></th>
+                        <th class="tbl_col_db_server" scope="col"><tmpl_var name="db_server_txt"></th>
+                        <th class="tbl_col_vserver_server" scope="col"><tmpl_var name="vserver_server_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+                        <td class="tbl_col_mail_server"><select name="search_active">{tmpl_var name='search_mail_server'}</select></td>
+                        <td class="tbl_col_web_server"><select name="search_active">{tmpl_var name='search_web_server'}</select></td>
+                        <td class="tbl_col_dns_server"><select name="search_active">{tmpl_var name='search_dns_server'}</select></td>
+                        <td class="tbl_col_file_server"><select name="search_active">{tmpl_var name='search_file_server'}</select></td>
+                        <td class="tbl_col_db_server"><select name="search_active">{tmpl_var name='search_db_server'}</select></td>
+                        <td class="tbl_col_vserver_server"><select name="search_active">{tmpl_var name='search_vserver_server'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_name"><a href="#" onClick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
+                            <td class="tbl_col_mail_server">{tmpl_var name="mail_server"}</td>
+                            <td class="tbl_col_web_server">{tmpl_var name="web_server"}</td>
+                            <td class="tbl_col_dns_server">{tmpl_var name="dns_server"}</td>
+                            <td class="tbl_col_file_server">{tmpl_var name="file_server"}</td>
+                            <td class="tbl_col_db_server">{tmpl_var name="db_server"}</td>
+                            <td class="tbl_col_vserver_server">{tmpl_var name="vserver_server"}</td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_fastcgi_edit.htm b/interface/web/themes/default-v2/templates/admin/server_php_fastcgi_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..21eba026782bec03873a441a04672db51577a813
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_php_fastcgi_edit.htm
@@ -0,0 +1,26 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_php">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="php_fastcgi_binary">{tmpl_var name='php_fastcgi_binary_txt'}</label>
+                <input name="php_fastcgi_binary" id="php_fastcgi_binary" value="{tmpl_var name='php_fastcgi_binary'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="php_fastcgi_ini_dir">{tmpl_var name='php_fastcgi_ini_dir_txt'}</label>
+                <input name="php_fastcgi_ini_dir" id="php_fastcgi_ini_dir" value="{tmpl_var name='php_fastcgi_ini_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_php_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_php_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_fpm_edit.htm b/interface/web/themes/default-v2/templates/admin/server_php_fpm_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..92cd4a88ba2c54b60b65d0a8725fe6ca33c157a3
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_php_fpm_edit.htm
@@ -0,0 +1,30 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_php">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="php_fpm_init_script">{tmpl_var name='php_fpm_init_script_txt'}</label>
+                <input name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="php_fpm_ini_dir">{tmpl_var name='php_fpm_ini_dir_txt'}</label>
+                <input name="php_fpm_ini_dir" id="php_fpm_ini_dir" value="{tmpl_var name='php_fpm_ini_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="php_fpm_pool_dir">{tmpl_var name='php_fpm_pool_dir_txt'}</label>
+                <input name="php_fpm_pool_dir" id="php_fpm_pool_dir" value="{tmpl_var name='php_fpm_pool_dir'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_php_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_php_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_list.htm b/interface/web/themes/default-v2/templates/admin/server_php_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..44e6a1fdeea6409cc7f7b5afb02ecbf841efc15a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_php_list.htm
@@ -0,0 +1,55 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_server_php">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/server_php_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_ip_address" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+                        <td class="tbl_col_ip_address"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/server_php_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/server_php_name_edit.htm b/interface/web/themes/default-v2/templates/admin/server_php_name_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..d9e88ff1927e0b0224491e98eb8aab770c466826
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/server_php_name_edit.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_server_php">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="client_id">{tmpl_var name='client_id_txt'}</label>
+                <select name="client_id" id="client_id" class="selectInput">
+                    {tmpl_var name='client_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_php_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_php_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/software_package_install.htm b/interface/web/themes/default-v2/templates/admin/software_package_install.htm
new file mode 100644
index 0000000000000000000000000000000000000000..1d2d4de95b271483dce5bee91dc1dc4e098e5da4
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/software_package_install.htm
@@ -0,0 +1,30 @@
+<h2><tmpl_var name="head_txt"></h2>
+<p><tmpl_var name="desc_txt"></p>
+
+<div class="panel panel_software_repo">
+    <tmpl_if name="message_err">
+        <div id="errorMsg"><tmpl_var name="message_err"></div>
+    </tmpl_if>
+    <tmpl_if name="message_ok">
+        <div id="OKMsg"><tmpl_var name="message_ok"></div>
+    </tmpl_if>
+    <tmpl_if name="insert_key">
+        <div class="pnl_formsarea">
+            <fieldset class="inlineLabels">
+                <p>&nbsp;</p>
+                <div class="ctrlHolder">
+                    <label for="install_key">{tmpl_var name='install_key_txt'}</label>
+                    <input name="install_key" id="install_key" value="{tmpl_var name='install_key'}" size="40" maxlength="40" type="text" class="textInput" />
+                </div>
+                    
+                <input type="hidden" name="package" value="{tmpl_var name='package_name'}">
+                <input type="hidden" name="server_id" value="{tmpl_var name='server_id'}">
+                <p>&nbsp;</p>
+                <div class="buttonHolder buttons">
+                    <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/software_package_install.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+                    <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/software_package_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+                </div>
+            </fieldset>
+        </div>
+    </tmpl_if>
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/software_package_list.htm b/interface/web/themes/default-v2/templates/admin/software_package_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0cb6f47c16f6a7b1b45246453c4c00932a6c1688
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/software_package_list.htm
@@ -0,0 +1,46 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_package">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/software_package_list.php?action=repoupdate');">
+                    <span>{tmpl_var name="repoupdate_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
+                        <th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
+                        <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
+                        <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_id_txt"></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_installed">{tmpl_var name="installed"}</td>
+                            <td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
+                            <td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
+                            <td class="tbl_col_package_description">ispapp{tmpl_var name="package_id"}</td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/software_repo_edit.htm b/interface/web/themes/default-v2/templates/admin/software_repo_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..bd8b2305222ad80a3118c2b94cb0760da9583fd8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/software_repo_edit.htm
@@ -0,0 +1,40 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_software_repo">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="repo_name">{tmpl_var name='repo_name_txt'}</label>
+                <input name="repo_name" id="repo_name" value="{tmpl_var name='repo_name'}" size="40" maxlength="40" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="repo_url">{tmpl_var name='repo_url_txt'}</label>
+                <input name="repo_url" id="repo_url" value="{tmpl_var name='repo_url'}" size="40" maxlength="40" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="repo_username">{tmpl_var name='repo_username_txt'}</label>
+                <input name="repo_username" id="repo_username" value="{tmpl_var name='repo_username'}" size="30" maxlength="30" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="repo_password">{tmpl_var name='repo_password_txt'}</label>
+                <input name="repo_password" id="repo_password" value="{tmpl_var name='repo_password'}" size="30" maxlength="30" type="password" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/software_repo_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/software_repo_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/software_repo_list.htm b/interface/web/themes/default-v2/templates/admin/software_repo_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..16a1749315931a5241c85975334690d86b295428
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/software_repo_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_software_repo">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/software_repo_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_repo_name" scope="col"><tmpl_var name="repo_name_txt"></th>
+                        <th class="tbl_col_repo_url" scope="col"><tmpl_var name="repo_url_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_repo_name"><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td>
+                        <td class="tbl_col_repo_url"><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/software_repo_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_repo_name"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_name"}</a></td>
+                            <td class="tbl_col_repo_url"><a href="#" onClick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_url"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('admin/software_repo_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/software_update_list.htm b/interface/web/themes/default-v2/templates/admin/software_update_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..8a3760e71a94eebdecf979ee37d8e32408b11d6b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/software_update_list.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_software_update">
+
+    <div class="pnl_toolsarea">
+        <fieldset class="inlineLabels"><legend>Tools</legend>
+            <div class="buttons">
+                <div class="ctrlHolder">
+                    <label for="server_id">{tmpl_var name='server_select_txt'}</label>
+                    <select name="server_id" id="server_id" class="selectInput" onChange="submitForm('pageForm','admin/software_update_list.php');">
+                        <tmpl_loop name="servers">
+                            <option value="{tmpl_var name='server_id'}" {tmpl_var name='selected'}>{tmpl_var name='server_name'}</option>
+                        </tmpl_loop>
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+  
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
+                        <th class="tbl_col_update_title" scope="col"><tmpl_var name="update_title_txt"></th>
+                        <th class="tbl_col_version" scope="col"><tmpl_var name="version_txt"></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_installed">{tmpl_var name="installed"}</td>
+                            <td class="tbl_col_update_title">{tmpl_var name="update_title"}</td>
+                            <td class="tbl_col_version">{tmpl_var name="version"}</td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_domains_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_domains_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..605587900df6f1c0a01a3a8e36219c5940d80b63
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/system_config_domains_edit.htm
@@ -0,0 +1,33 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_system_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <div style="float:left;width:100%">
+                    <p class="label" style="width:270px">{tmpl_var name='use_domain_module_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='use_domain_module'}
+                    </div>
+                </div>
+                <div style="float:left;width:500px;margin-top:20px">{tmpl_var name='use_domain_module_hint'}</div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='new_domain_txt'}</p>
+                <div class="multiField">
+                    <textarea name="new_domain_html" id="new_domain_html" style="width: 500px; height: 250px">{tmpl_var name='new_domain_html'}</textarea>
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..18fdfccc9db23b2cda5247ce41df04beefee7c68
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_system_config">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='enable_custom_login_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='enable_custom_login'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mailboxlist_webmail_link_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='mailboxlist_webmail_link'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="webmail_url">{tmpl_var name='webmail_url_txt'}</label>
+                <input name="webmail_url" id="webmail_url" value="{tmpl_var name='webmail_url'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mailmailinglist_link_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='mailmailinglist_link'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="mailmailinglist_url">{tmpl_var name='mailmailinglist_url_txt'}</label>
+                <input name="mailmailinglist_url" id="mailmailinglist_url" value="{tmpl_var name='mailmailinglist_url'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="admin_mail">{tmpl_var name='admin_mail_txt'}</label>
+                <input name="admin_mail" id="admin_mail" value="{tmpl_var name='admin_mail'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="admin_name">{tmpl_var name='admin_name_txt'}</label>
+                <input name="admin_name" id="admin_name" value="{tmpl_var name='admin_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_misc_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_misc_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..31350cdb978fb1cdee8d34a613a29ef4b02403e9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/system_config_misc_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_system_config">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Misc</legend>
+            <div class="ctrlHolder">
+                <label for="dashboard_atom_url_admin">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
+                <input name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dashboard_atom_url_reseller">{tmpl_var name='dashboard_atom_url_reseller_txt'}</label>
+                <input name="dashboard_atom_url_reseller" id="dashboard_atom_url_reseller" value="{tmpl_var name='dashboard_atom_url_reseller'}" size="" maxlength="" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dashboard_atom_url_client">{tmpl_var name='dashboard_atom_url_client_txt'}</label>
+                <input name="dashboard_atom_url_client" id="dashboard_atom_url_client" value="{tmpl_var name='dashboard_atom_url_client'}" size="" maxlength="" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="monitor_key">{tmpl_var name='monitor_key_txt'}</label>
+                <input name="monitor_key" id="monitor_key" value="{tmpl_var name='monitor_key'}" size="" maxlength="" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='maintenance_mode_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='maintenance_mode'}
+                </div>
+            </div>
+        </fieldset>
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..21bbf0ef151fdf9fa51668c02a6be60f57203fa2
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_system_config">
+	
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="dbname_prefix">{tmpl_var name='dbname_prefix_txt'}</label>
+                <input name="dbname_prefix" id="dbname_prefix" value="{tmpl_var name='dbname_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dbuser_prefix">{tmpl_var name='dbuser_prefix_txt'}</label>
+                <input name="dbuser_prefix" id="dbuser_prefix" value="{tmpl_var name='dbuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ftpuser_prefix">{tmpl_var name='ftpuser_prefix_txt'}</label>
+                <input name="ftpuser_prefix" id="ftpuser_prefix" value="{tmpl_var name='ftpuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="shelluser_prefix">{tmpl_var name='shelluser_prefix_txt'}</label>
+                <input name="shelluser_prefix" id="shelluser_prefix" value="{tmpl_var name='shelluser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="webdavuser_prefix">{tmpl_var name='webdavuser_prefix_txt'}</label>
+                <input name="webdavuser_prefix" id="webdavuser_prefix" value="{tmpl_var name='webdavuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='dblist_phpmyadmin_link_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='dblist_phpmyadmin_link'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="phpmyadmin_url">{tmpl_var name='phpmyadmin_url_txt'}</label>
+                <input name="phpmyadmin_url" id="phpmyadmin_url" value="{tmpl_var name='phpmyadmin_url'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="webftp_url">{tmpl_var name='webftp_url_txt'}</label>
+                <input name="webftp_url" id="webftp_url" value="{tmpl_var name='webftp_url'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/users_groups_edit.htm b/interface/web/themes/default-v2/templates/admin/users_groups_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cb52ae32b5207b18380d782fe0f2afe490093db5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/users_groups_edit.htm
@@ -0,0 +1,30 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_users">
+	
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="default_group">{tmpl_var name='default_group_txt'}</label>
+                <select name="default_group" id="default_group" class="selectInput">
+                    {tmpl_var name='default_group'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='groups_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='groups'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/users_list.htm b/interface/web/themes/default-v2/templates/admin/users_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..25cafe62cdd1c8246cd9bb1b8302202e3a83b9b4
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/users_list.htm
@@ -0,0 +1,60 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_users">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('admin/users_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+                <p><tmpl_var name="warning_txt"></p>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_username"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <tmpl_if name="username" op="!=" value="admin">
+                                        <a class="icons16 icoLoginAs" href="#" onclick="loadContent('admin/login_as.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                        <a class="icons16 icoDelete" href="javascript: del_record('admin/users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                    </tmpl_if>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/admin/users_user_edit.htm b/interface/web/themes/default-v2/templates/admin/users_user_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..66142a47773c2927ec8e3056a842656e14ef86c6
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/admin/users_user_edit.htm
@@ -0,0 +1,73 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_users">
+	
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="15" maxlength="30" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="passwort">{tmpl_var name='passwort_txt'}</label>
+                <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput"  onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('passwort');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('passwort','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='modules_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='modules'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="startmodule">{tmpl_var name='startmodule_txt'}</label>
+                <select name="startmodule" id="startmodule" class="selectInput formLengthHalf">
+                    {tmpl_var name='startmodule'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='app_theme_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='app_theme'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='typ_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='typ'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="language">{tmpl_var name='language_txt'}</label>
+                <select name="language" id="language" class="selectInput flags">
+                    {tmpl_var name='language'}
+                </select>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_circle_edit.htm b/interface/web/themes/default-v2/templates/client/client_circle_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..1616dd4773bf235fe0eaf5761c5f4a6d6027f20b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_circle_edit.htm
@@ -0,0 +1,39 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='circle_txt'}</legend>
+            <div class="ctrlHolder">
+                <label for="circle_name">{tmpl_var name='circle_name_txt'}*</label>
+                <input name="circle_name" id="circle_name" value="{tmpl_var name='circle_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='client_ids_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='client_ids'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="description">{tmpl_var name='description_txt'}</label>
+                <textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            {tmpl_var name='required_fields_txt'}
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_circle_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_circle_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_circle_list.htm b/interface/web/themes/default-v2/templates/client/client_circle_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..4c5a889b64df653a7a20ef6d45e5ee8edc6b348a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_circle_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_clients">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_circle_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_circle_id" scope="col"><tmpl_var name="circle_id_txt"></th>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_circle_name" scope="col"><tmpl_var name="circle_name_txt"></th>
+                        <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_circle_id"><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_circle_name"><input type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" style="width:120px;" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_circle_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_circle_id"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_id"}</a></td>
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_circle_name"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_name"}</a></td>
+                            <td class="tbl_col_description"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16" style="width:60px;">
+                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_circle_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_del.htm b/interface/web/themes/default-v2/templates/client/client_del.htm
new file mode 100644
index 0000000000000000000000000000000000000000..aeb206f1078adad74843c522d08bd2fe04586210
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_del.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client_del">
+
+    <div class="pnl_formsarea">
+
+        <div id="OKMsg">
+            <tmpl_var name="delete_explanation">:<br /><br />
+                <tmpl_loop name="records">
+                    <tmpl_var name="table">, 
+                </tmpl_loop>
+        </div>
+
+        <input type="checkbox" name="confirm" value="yes" /> <b><tmpl_var name="confirm_action_txt"></b>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_del.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_edit_address.htm b/interface/web/themes/default-v2/templates/client/client_edit_address.htm
new file mode 100644
index 0000000000000000000000000000000000000000..8ca7bce5a136152e2118eda034407c8c189a3430
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_edit_address.htm
@@ -0,0 +1,140 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Address</legend>
+            <div class="ctrlHolder">
+                <label for="company_name">{tmpl_var name='company_name_txt'}</label>
+                <input name="company_name" id="company_name" value="{tmpl_var name='company_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="contact_name">{tmpl_var name='contact_name_txt'}*</label>
+                <input name="contact_name" id="contact_name" value="{tmpl_var name='contact_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="customer_no">{tmpl_var name='customer_no_txt'}</label>
+                <input name="customer_no" id="customer_no" value="{tmpl_var name='customer_no'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}*</label>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="language">{tmpl_var name='language_txt'}</label>
+                <select name="language" id="language" class="selectInput flags">
+                    {tmpl_var name='language'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="usertheme">{tmpl_var name='usertheme_txt'}</label>
+                <select name="usertheme" id="usertheme" class="selectInput">
+                    {tmpl_var name='usertheme'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="street">{tmpl_var name='street_txt'}</label>
+                <input name="street" id="street" value="{tmpl_var name='street'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="zip">{tmpl_var name='zip_txt'}</label>
+                <input name="zip" id="zip" value="{tmpl_var name='zip'}" size="10" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="city">{tmpl_var name='city_txt'}</label>
+                <input name="city" id="city" value="{tmpl_var name='city'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="state">{tmpl_var name='state_txt'}</label>
+                <input name="state" id="state" value="{tmpl_var name='state'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="country">{tmpl_var name='country_txt'}</label>
+                <select name="country" id="country" class="selectInput flags">
+                    {tmpl_var name='country'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="telephone">{tmpl_var name='telephone_txt'}</label>
+                <input name="telephone" id="telephone" value="{tmpl_var name='telephone'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mobile">{tmpl_var name='mobile_txt'}</label>
+                <input name="mobile" id="mobile" value="{tmpl_var name='mobile'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fax">{tmpl_var name='fax_txt'}</label>
+                <input name="fax" id="fax" value="{tmpl_var name='fax'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="email">{tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="internet">{tmpl_var name='internet_txt'}</label>
+                <input name="internet" id="internet" value="{tmpl_var name='internet'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="icq">{tmpl_var name='icq_txt'}</label>
+                <input name="icq" id="icq" value="{tmpl_var name='icq'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="vat_id">{tmpl_var name='vat_id_txt'}</label>
+                <input name="vat_id" id="vat_id" value="{tmpl_var name='vat_id'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="company_id">{tmpl_var name='company_id_txt'}</label>
+                <input name="company_id" id="company_id" value="{tmpl_var name='company_id'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bank_account_number">{tmpl_var name='bank_account_number_txt'}</label>
+                <input name="bank_account_number" id="bank_account_number" value="{tmpl_var name='bank_account_number'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bank_code">{tmpl_var name='bank_code_txt'}</label>
+                <input name="bank_code" id="bank_code" value="{tmpl_var name='bank_code'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bank_name">{tmpl_var name='bank_name_txt'}</label>
+                <input name="bank_name" id="bank_name" value="{tmpl_var name='bank_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bank_account_iban">{tmpl_var name='bank_account_iban_txt'}</label>
+                <input name="bank_account_iban" id="bank_account_iban" value="{tmpl_var name='bank_account_iban'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bank_account_swift">{tmpl_var name='bank_account_swift_txt'}</label>
+                <input name="bank_account_swift" id="bank_account_swift" value="{tmpl_var name='bank_account_swift'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="notes">{tmpl_var name='notes_txt'}</label>
+                <textarea name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea>
+            </div>
+            {tmpl_var name='required_fields_txt'}
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_edit_limits.htm b/interface/web/themes/default-v2/templates/client/client_edit_limits.htm
new file mode 100644
index 0000000000000000000000000000000000000000..56063459ebb278278448c20d2dae07b091f74d9e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_edit_limits.htm
@@ -0,0 +1,230 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client">
+
+    <tmpl_if name="is_admin">
+        <div class="pnl_toolsarea">
+            <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+                <div class="buttons">
+                    <button class="positive iconstxt icoAdd" type="button" value="{tmpl_var name='add_additional_template_txt'}" onClick="addAdditionalTemplate();"><span>Add additional template</span></button>
+                    <button class="negative iconstxt icoDelete" type="button" value="{tmpl_var name='delete_additional_template_txt'}" onClick="delAdditionalTemplate();"><span>Delete additional template</span></button>
+                </div>
+            </fieldset>
+        </div>
+    </tmpl_if>
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Limits</legend>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <label for="template_master">{tmpl_var name='template_master_txt'}</label>
+                    <select name="template_master" id="template_master" class="selectInput">
+                        {tmpl_var name='template_master'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="template_additional">{tmpl_var name='template_additional_txt'}</label>
+                    <select name="tpl_add_select" id="tpl_add_select" class="selectInput">
+                        {tmpl_var name='tpl_add_select'}
+                    </select>
+                    <div id="template_additional_list"><br /><br />{tmpl_var name='template_additional_list'}</div>
+                    <input type="hidden" id="template_additional" name="template_additional" value="{tmpl_var name='template_additional'}">
+                </div>
+                <div class="ctrlHolder">
+                    &nbsp;
+                </div>
+            </tmpl_if>
+            <div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
+            <div>
+                <div class="ctrlHolder">
+                    <label for="default_webserver">{tmpl_var name='default_webserver_txt'}</label>
+                    <select name="default_webserver" id="default_webserver" class="selectInput">
+                        {tmpl_var name='default_webserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
+                    <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
+                    <input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
+                    <input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='web_php_options_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='web_php_options'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+                    <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
+                    <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
+                    <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
+                    <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='ssh_chroot_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='ssh_chroot'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
+                    <input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_mailserver">{tmpl_var name='default_mailserver_txt'}</label>
+                    <select name="default_mailserver" id="default_mailserver" class="selectInput">
+                        {tmpl_var name='default_mailserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
+                    <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
+                    <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
+                    <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailaliasdomain">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
+                    <input name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailmailinglist">{tmpl_var name='limit_mailmailinglist_txt'}</label>
+                    <input name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
+                    <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
+                    <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
+                    <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
+                    <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
+                    <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
+                    <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+                    <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+                    <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+                    <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='database_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_dbserver">{tmpl_var name='default_dbserver_txt'}</label>
+                    <select name="default_dbserver" id="default_dbserver" class="selectInput">
+                        {tmpl_var name='default_dbserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
+                    <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_cron">{tmpl_var name='limit_cron_txt'}</label>
+                    <input name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_type">{tmpl_var name='limit_cron_type_txt'}</label>
+                    <select name="limit_cron_type" id="limit_cron_type" class="selectInput formLengthHalf">
+                        {tmpl_var name='limit_cron_type'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_frequency">{tmpl_var name='limit_cron_frequency_txt'}</label>
+                    <input name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='dns_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_dnsserver">{tmpl_var name='default_dnsserver_txt'}</label>
+                    <select name="default_dnsserver" id="default_dnsserver" class="selectInput">
+                        {tmpl_var name='default_dnsserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
+                    <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_slave_zone">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
+                    <input name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
+                    <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='virtualization_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
+                    <input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
+                    <select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
+                        {tmpl_var name='limit_openvz_vm_template_id'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_message.htm b/interface/web/themes/default-v2/templates/client/client_message.htm
new file mode 100644
index 0000000000000000000000000000000000000000..20afdb111244204a5012252a7d3d0877141ae87c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_message.htm
@@ -0,0 +1,39 @@
+<h2><tmpl_var name="page_head_txt"></h2>
+<p><tmpl_var name="form_desc_txt"></p>
+
+<div class="panel panel_client">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='form_legend_txt'}</legend>
+            <tmpl_if name="okmsg">
+                <div id="OKMsg"><p><tmpl_var name="okmsg"></p></div>
+            </tmpl_if>
+            <tmpl_if name="error">
+                <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="sender">{tmpl_var name='sender_txt'}</label>
+                <input name="sender" id="sender" value="{tmpl_var name='sender'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="recipient">{tmpl_var name='recipient_txt'}</label>
+                <select name="recipient" id="recipient" class="selectInput">
+                    {tmpl_var name='recipient'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="subject">{tmpl_var name='subject_txt'}</label>
+                <input name="subject" id="subject" value="{tmpl_var name='subject'}" style="width:500px" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="message">{tmpl_var name='message_txt'}</label>
+                <textarea name="message" id="message" rows='' cols='' style="width:500px">{tmpl_var name='message'}</textarea>&nbsp;{tmpl_var name="variables_txt"}&nbsp;{tmpl_var name="message_variables"}
+            </div>
+        </fieldset>
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_send_txt'}" onClick="submitForm('pageForm','client/client_message.php');"><span>{tmpl_var name='btn_send_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm b/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm
new file mode 100644
index 0000000000000000000000000000000000000000..81a2e595b32087d2a80f0b3300394bb397bd465b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm
@@ -0,0 +1,176 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client_template">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Limits</legend>
+            <div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
+            <div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
+                    <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
+                    <input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
+                    <input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='web_php_options_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='web_php_options'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+                    <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
+                    <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
+                    <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
+                    <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='ssh_chroot_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='ssh_chroot'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
+                    <input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
+                    <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
+                    <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
+                    <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailaliasdomain">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
+                    <input name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailmailinglist">{tmpl_var name='limit_mailmailinglist_txt'}</label>
+                    <input name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
+                    <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
+                    <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
+                    <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
+                    <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
+                    <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
+                    <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+                    <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+                    <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+                    <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='database_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
+                    <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_cron">{tmpl_var name='limit_cron_txt'}</label>
+                    <input name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_type">{tmpl_var name='limit_cron_type_txt'}</label>
+                    <select name="limit_cron_type" id="limit_cron_type" class="selectInput formLengthHalf">
+                        {tmpl_var name='limit_cron_type'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_frequency">{tmpl_var name='limit_cron_frequency_txt'}</label>
+                    <input name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='dns_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
+                    <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_slave_zone">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
+                    <input name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
+                    <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='virtualization_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
+                    <input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
+                    <select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
+                        {tmpl_var name='limit_openvz_vm_template_id'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/client_template_edit_template.htm b/interface/web/themes/default-v2/templates/client/client_template_edit_template.htm
new file mode 100644
index 0000000000000000000000000000000000000000..232fa55fa7baa0d3e13e78a94de0bc4d8e1b80d5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_template_edit_template.htm
@@ -0,0 +1,28 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client_template">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Template</legend>
+            <div class="ctrlHolder">
+                <label for="template_type">{tmpl_var name='template_type_txt'}</label>
+                <select name="template_type" id="template_type" class="selectInput">
+                    {tmpl_var name='template_type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="template_name">{tmpl_var name='template_name_txt'}</label>
+                <input name="template_name" id="template_name" value="{tmpl_var name='template_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/client_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/client_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/client/client_template_list.htm b/interface/web/themes/default-v2/templates/client/client_template_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..5249fce5d5bb0bb5b728baff4ed5640596ecde5c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/client_template_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_limit_template">
+
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_template_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
+                        <th class="tbl_col_template_type" scope="col"><tmpl_var name="template_type_txt"></th>
+                        <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_template_id"><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_template_type"><select name="search_template_type">{tmpl_var name='search_template_type'}</select></td>
+                        <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_template_id"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_id"}</a></td>
+                            <td class="tbl_col_template_type"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_type"}</a></td>
+                            <td class="tbl_col_template_name"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">
+                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/clients_list.htm b/interface/web/themes/default-v2/templates/client/clients_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c62a2ee2c760567d73a491fca3a8bd89258c8949
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/clients_list.htm
@@ -0,0 +1,68 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_clients">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/client_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
+                        <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
+                        <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" style="width:120px;" /></td>
+                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
+                        <td class="tbl_col_country"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" style="width:30px;" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_company_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
+                            <td class="tbl_col_contact_name"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
+                            <td class="tbl_col_username"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                            <td class="tbl_col_city"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
+                            <td class="tbl_col_country"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16" style="width:60px;">
+                                    <tmpl_if name="is_admin">
+                                        <a class="icons16 icoLoginAs" href="#" onclick="loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                    </tmpl_if>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/reseller_edit_address.htm b/interface/web/themes/default-v2/templates/client/reseller_edit_address.htm
new file mode 100644
index 0000000000000000000000000000000000000000..5ab15353ab89ebc99b676fde7bb37e6d59d07080
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/reseller_edit_address.htm
@@ -0,0 +1,116 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Address</legend>
+            <div class="ctrlHolder">
+                <label for="company_name">{tmpl_var name='company_name_txt'}</label>
+                <input name="company_name" id="company_name" value="{tmpl_var name='company_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="contact_name">{tmpl_var name='contact_name_txt'}*</label>
+                <input name="contact_name" id="contact_name" value="{tmpl_var name='contact_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="customer_no">{tmpl_var name='customer_no_txt'}</label>
+                <input name="customer_no" id="customer_no" value="{tmpl_var name='customer_no'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}*</label>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="language">{tmpl_var name='language_txt'}</label>
+                <select name="language" id="language" class="selectInput flags">
+                    {tmpl_var name='language'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="usertheme">{tmpl_var name='usertheme_txt'}</label>
+                <select name="usertheme" id="usertheme" class="selectInput">
+                    {tmpl_var name='usertheme'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="street">{tmpl_var name='street_txt'}</label>
+                <input name="street" id="street" value="{tmpl_var name='street'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="zip">{tmpl_var name='zip_txt'}</label>
+                <input name="zip" id="zip" value="{tmpl_var name='zip'}" size="10" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="city">{tmpl_var name='city_txt'}</label>
+                <input name="city" id="city" value="{tmpl_var name='city'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="state">{tmpl_var name='state_txt'}</label>
+                <input name="state" id="state" value="{tmpl_var name='state'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="country">{tmpl_var name='country_txt'}</label>
+                <select name="country" id="country" class="selectInput flags">
+                    {tmpl_var name='country'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="telephone">{tmpl_var name='telephone_txt'}</label>
+                <input name="telephone" id="telephone" value="{tmpl_var name='telephone'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="mobile">{tmpl_var name='mobile_txt'}</label>
+                <input name="mobile" id="mobile" value="{tmpl_var name='mobile'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fax">{tmpl_var name='fax_txt'}</label>
+                <input name="fax" id="fax" value="{tmpl_var name='fax'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="email">{tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="internet">{tmpl_var name='internet_txt'}</label>
+                <input name="internet" id="internet" value="{tmpl_var name='internet'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="icq">{tmpl_var name='icq_txt'}</label>
+                <input name="icq" id="icq" value="{tmpl_var name='icq'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="vat_id">{tmpl_var name='vat_id_txt'}</label>
+                <input name="vat_id" id="vat_id" value="{tmpl_var name='vat_id'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="notes">{tmpl_var name='notes_txt'}</label>
+                <textarea name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea>
+            </div>
+            {tmpl_var name='required_fields_txt'}
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/reseller_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/reseller_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm b/interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm
new file mode 100644
index 0000000000000000000000000000000000000000..85936e9519d0fb5e99648b6d1e11da8894d64912
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/reseller_edit_limits.htm
@@ -0,0 +1,225 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_client">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Limits</legend>
+            <!--
+            <tmpl_if name="is_admin">
+                  <div class="ctrlHolder">
+                    <label for="template_master">{tmpl_var name='template_master_txt'}</label>
+                    <select name="template_master" id="template_master" class="selectInput">
+                                                    {tmpl_var name='template_master'}
+                                            </select>
+                  </div>
+                  <div class="ctrlHolder">
+                    <label for="template_additional">{tmpl_var name='template_additional_txt'}</label>
+                    <select name="tpl_add_select" id="tpl_add_select" class="selectInput">
+                                                    {tmpl_var name='tpl_add_select'}
+                                            </select>
+                          <span id="template_additional_list">{tmpl_var name='template_additional_list'}</span>
+                              <input type="hidden" id="template_additional" name="template_additional" value="{tmpl_var name='template_additional'}">
+                  </div>
+                      <div class="ctrlHolder">
+                        &nbsp;
+                      </div>
+            </tmpl_if>
+            -->
+            <div class="ctrlHolder">
+                <label for="limit_client">{tmpl_var name='limit_client_txt'}</label>
+                <input name="limit_client" id="limit_client" value="{tmpl_var name='limit_client'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
+            <div>
+                <div class="ctrlHolder">
+                    <label for="default_webserver">{tmpl_var name='default_webserver_txt'}</label>
+                    <select name="default_webserver" id="default_webserver" class="selectInput">
+                        {tmpl_var name='default_webserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
+                    <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
+                    <input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
+                    <input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='web_php_options_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='web_php_options'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+                    <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
+                    <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
+                    <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
+                    <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='ssh_chroot_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='ssh_chroot'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
+                    <input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_mailserver">{tmpl_var name='default_mailserver_txt'}</label>
+                    <select name="default_mailserver" id="default_mailserver" class="selectInput">
+                        {tmpl_var name='default_mailserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
+                    <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailmailinglist">{tmpl_var name='limit_mailmailinglist_txt'}</label>
+                    <input name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
+                    <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
+                    <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailaliasdomain">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
+                    <input name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
+                    <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
+                    <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
+                    <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
+                    <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
+                    <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
+                    <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+                    <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+                    <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+                    <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='database_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_dbserver">{tmpl_var name='default_dbserver_txt'}</label>
+                    <select name="default_dbserver" id="default_dbserver" class="selectInput">
+                        {tmpl_var name='default_dbserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
+                    <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_cron">{tmpl_var name='limit_cron_txt'}</label>
+                    <input name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_type">{tmpl_var name='limit_cron_type_txt'}</label>
+                    <select name="limit_cron_type" id="limit_cron_type" class="selectInput formLengthHalf">
+                        {tmpl_var name='limit_cron_type'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_cron_frequency">{tmpl_var name='limit_cron_frequency_txt'}</label>
+                    <input name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='dns_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="default_dnsserver">{tmpl_var name='default_dnsserver_txt'}</label>
+                    <select name="default_dnsserver" id="default_dnsserver" class="selectInput">
+                        {tmpl_var name='default_dnsserver'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
+                    <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_slave_zone">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
+                    <input name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
+                    <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='virtualization_limits_txt'}<em></em></div>
+            <div style="display:none;">
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
+                    <input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
+                    <select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
+                        {tmpl_var name='limit_openvz_vm_template_id'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/reseller_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/reseller_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/client/resellers_list.htm b/interface/web/themes/default-v2/templates/client/resellers_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..fba6f1c0121ee729d930e60fcd903e3eae8b0d00
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/client/resellers_list.htm
@@ -0,0 +1,63 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_clients">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('client/reseller_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
+                        <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
+                        <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
+                        <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
+                        <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" style="width:120px;" /></td>
+                        <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" style="width:120px;" /></td>
+                        <td class="tbl_col_country"><input type="text" name="search_country" value="{tmpl_var name='search_country'}" style="width:30px;" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/reseller_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_client_id"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
+                            <td class="tbl_col_company_name"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
+                            <td class="tbl_col_contact_name"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
+                            <td class="tbl_col_city"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
+                            <td class="tbl_col_country"><a href="#" onClick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="country"}</a></td>
+                            <td class="tbl_col_buttons">
+                            <div class="buttons icons16" style="width:60px;">
+                                <a class="icons16 icoLoginAs" href="#" onclick="loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+                                <a class="icons16 icoDelete" href="javascript: del_record('client/reseller_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dashboard/custom_menu.htm b/interface/web/themes/default-v2/templates/dashboard/custom_menu.htm
new file mode 100644
index 0000000000000000000000000000000000000000..4b06779659c111b19e1f639e828521dccef9837b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dashboard/custom_menu.htm
@@ -0,0 +1,9 @@
+<ul id="submenu">
+    <li class="title"><a>{tmpl_var name='latest_news_txt'}</a></li>
+    <tmpl_loop name="news">
+        <li>
+            <a href="{tmpl_var name="link"}" target="_blank" style="margin-top:8px;padding-bottom:5px;"><b>{tmpl_var name="date"}</b><br />
+                {tmpl_var name="title"}</a>
+        </li>
+    </tmpl_loop>
+</ul>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dashboard/dashboard.htm b/interface/web/themes/default-v2/templates/dashboard/dashboard.htm
new file mode 100644
index 0000000000000000000000000000000000000000..383d6b95c8f056ebf9b99299762e056a0a1c6374
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dashboard/dashboard.htm
@@ -0,0 +1,39 @@
+<h1><tmpl_var name="welcome_user"></h1>
+<hr />
+<div class="panel panel_dashboard">
+    <div>
+        <tmpl_if name='error'>
+            <div class="systemmonitor-state state-error">
+                <tmpl_loop name="error">
+                    <p>{tmpl_var name='error_msg'}</p>
+                </tmpl_loop>
+            </div>
+        </tmpl_if>
+        <tmpl_if name='warning'>
+            <div class="systemmonitor-state state-warning">
+                <tmpl_loop name="warning">
+                    <p>{tmpl_var name='warning_msg'}</p>
+                </tmpl_loop>
+            </div>
+        </tmpl_if>
+        <tmpl_if name='info'>
+            <div class="systemmonitor-state state-info">
+                <tmpl_loop name="info">
+                    <p>{tmpl_var name='info_msg'}</p>
+                </tmpl_loop>
+            </div>
+        </tmpl_if>
+    </div>
+    <div style="float:left; width:350px;">
+        <tmpl_loop name='leftcol'>
+            {tmpl_var name='content'}
+            <p>&nbsp;</p>
+        </tmpl_loop>
+    </div>
+    <div style="float:left; width:350px;">
+        <tmpl_loop name='rightcol'>
+            {tmpl_var name='content'}
+            <p>&nbsp;</p>
+        </tmpl_loop>
+    </div>
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dashlets/limits.htm b/interface/web/themes/default-v2/templates/dashlets/limits.htm
new file mode 100644
index 0000000000000000000000000000000000000000..11fe0bbe6a9a5d2571dab430ec8d8ae9e472dd88
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dashlets/limits.htm
@@ -0,0 +1,11 @@
+	<h2>{tmpl_var name='limits_txt'}</h2>
+	<div style="width:350px;">
+	<table class="list">
+	<tmpl_loop name='rows'>
+		<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+		  <td>{tmpl_var name='field_txt'}</td>
+		  <td style="white-space: nowrap">{tmpl_var name='usage'} {tmpl_var name='of_txt'} {tmpl_var name='value'}</td>
+		</tr>
+	</tmpl_loop>
+	</table>
+	</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dashlets/modules.htm b/interface/web/themes/default-v2/templates/dashlets/modules.htm
new file mode 100644
index 0000000000000000000000000000000000000000..03fb8cb887217143376804d44d6f0c5433ab16dd
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dashlets/modules.htm
@@ -0,0 +1,10 @@
+	<h2>{tmpl_var name='available_modules_txt'}</h2>
+	<div style="width:350px;">
+	<tmpl_loop name='modules'>
+		<div class="dashboard-modules {tmpl_var name='modules_name'}">
+			<a href="#" onclick="capp('{tmpl_var name='modules_name'}')">
+			{tmpl_var name='modules_title'}
+			</a>
+		</div>
+	</tmpl_loop>
+	</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_a_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_a_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cce1af60521150bd3abc66659ad004b64d4adec4
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_a_edit.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_a">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='name_hint_txt'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput formLengthIPv4" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_a_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#data').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });	
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_a_list.htm b/interface/web/themes/default-v2/templates/dns/dns_a_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..913f628a69a919f09dd928b0c332fb65bf7673c2
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_a_list.htm
@@ -0,0 +1,88 @@
+<div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+        <div class="buttons">
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>A</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>AAAA</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>ALIAS</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>CNAME</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>HINFO</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>MX</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>NS</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>PTR</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>RP</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>SRV</span>
+            </button>
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');">
+                <span>TXT</span>
+            </button>
+        </div>
+    </fieldset>
+</div>
+
+<div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+        <table class="list">
+            <thead>
+                <tr>
+                    <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                    <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
+                    <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                    <th class="tbl_col_data" scope="col"><tmpl_var name="data_txt"></th>
+                    <th class="tbl_col_aux" scope="col"><tmpl_var name="aux_txt"></th>
+                    <th class="tbl_col_ttl" scope="col"><tmpl_var name="ttl_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                    <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
+                    <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                    <td class="tbl_col_data"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td>
+                    <td class="tbl_col_aux"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td>
+                    <td class="tbl_col_ttl"><input type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('dns_records','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+            </thead>
+            <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_type"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
+                        <td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                        <td class="tbl_col_data"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="data"}</a></td>
+                        <td class="tbl_col_aux"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="aux"}</a></td>
+                        <td class="tbl_col_ttl"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ttl"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                </tr>
+            </tfoot>
+        </table>
+    </fieldset>
+</div>
diff --git a/interface/web/themes/default-v2/templates/dns/dns_aaaa_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_aaaa_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..fdea8270c78e6cfe671947992611fcc4c0b17204
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_aaaa_edit.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_aaaa">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='name_hint_txt'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_aaaa_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#data').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv6',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });	
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_alias_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_alias_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2c859c7a059a9f6a90ed1cac4ab79b85327bc0bc
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_alias_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_alias">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_cname_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_cname_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..5cf86c589fbbb5b843f05244249a9266a171671a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_cname_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_cname">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_cname_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_hinfo_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_hinfo_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..1651bcc7d1bb8e4fe79f471f2831324447419b2b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_hinfo_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_hinfo">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_hinfo_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_import.htm b/interface/web/themes/default-v2/templates/dns/dns_import.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7f462ab62a9fe41fc2b3c4ee5507413f15c8a74f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_import.htm
@@ -0,0 +1,55 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_wizard">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend><tmpl_var name="zone_file_import_txt"></legend>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                    <select name="server_id" id="server_id" class="selectInput">
+                        {tmpl_var name='server_id'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" onkeydown="keydown(event.which);" /><p class="value"><tmpl_var name='domain_field_desc_txt'}</p>
+            </div>    
+            <div class="ctrlHolder"">
+                <label for="file">{tmpl_var name='zonefile_to_import_txt'}</label>
+                <input name="file" id="file" size="30" type="file" class="fileUpload" />
+            </div>
+                
+            <tmpl_if name="msg">
+                <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+            </tmpl_if>
+            <tmpl_if name="error">
+                <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+            </tmpl_if>
+                
+            <input type="hidden" name="id" value="{tmpl_var name='id'}">
+                
+            <div class="buttonHolder buttons">
+                <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitUploadForm('pageForm','dns/dns_import.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+                <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+            </div>
+                
+        </fieldset>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    function keydown(keynum){
+        if(keynum == 13){
+            jQuery('.positive').trigger('click');
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_mx_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_mx_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e986efb777a4575ea1c761a5ca3910789aab6060
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_mx_edit.htm
@@ -0,0 +1,42 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_mx">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="aux">{tmpl_var name='aux_txt'}</label>
+                <input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_mx_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_ns_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_ns_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..9efd881a902e081126f87ae673ed05890785458b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_ns_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_ns">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ns_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_ptr_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_ptr_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..5d8cf1fdbe1814a3361b162df1bfe662b4e08457
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_ptr_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_ptr">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_ptr_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_records_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_records_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f7852eab4f11922b1bc18fe9ef601c14f245c5a8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_records_edit.htm
@@ -0,0 +1,12 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_soa">
+
+    {tmpl_var name='dns_records'}
+
+    <div class="pnl_formsarea">
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_rp_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_rp_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..86697cfed6f2ca7467768b47c3fb79a5312e3517
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_rp_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_rp">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_rp_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_slave_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_slave_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b6dea70f9cdd873b2ca50c1f8bd63d58f95142cb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_slave_edit.htm
@@ -0,0 +1,97 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_slave">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend><tmpl_var name="secondary_zone_txt"></legend>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                    <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="origin">{tmpl_var name='origin_txt'}</label>
+                <input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ns">{tmpl_var name='ns_txt'}</label>
+                <input name="ns" id="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='ipv4_form_txt'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="xfer">{tmpl_var name='xfer_txt'}</label>
+                <input name="xfer" id="xfer" value="{tmpl_var name='xfer'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="serial" type="hidden" value="{tmpl_var name='serial'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_slave_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_slave_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#ns').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });
+    jQuery('#xfer').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });	
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_slave_list.htm b/interface/web/themes/default-v2/templates/dns/dns_slave_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..d4458e0d9f2221aa9eaaed339546df8bb985a8d5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_slave_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_dns_slave">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_slave_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                    <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                    <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                    <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
+                    <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                    <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                    <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
+                    <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_slave_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
+                        <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
+                        <td class="tbl_col_buttons">
+                        <div class="buttons icons16">    
+                            <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_slave_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                        </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/dns/dns_soa_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_soa_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..386a2ab6aee1909bd9ad1fb949d90af37535f3cc
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_soa_edit.htm
@@ -0,0 +1,131 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_soa">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>DNS Zone</legend>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="origin">{tmpl_var name='origin_txt'}</label>
+                <input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ns">{tmpl_var name='ns_txt'}</label>
+                <input name="ns" id="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='eg_ns1_domain_tld'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="mbox">{tmpl_var name='mbox_txt'}</label>
+                <input name="mbox" id="mbox" value="{tmpl_var name='mbox'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">{tmpl_var name='eg_webmaster_domain_tld'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="refresh">{tmpl_var name='refresh_txt'}</label>
+                <input name="refresh" id="refresh" value="{tmpl_var name='refresh'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;{tmpl_var name='seconds_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="retry">{tmpl_var name='retry_txt'}</label>
+                <input name="retry" id="retry" value="{tmpl_var name='retry'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;{tmpl_var name='seconds_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="expire">{tmpl_var name='expire_txt'}</label>
+                <input name="expire" id="expire" value="{tmpl_var name='expire'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;{tmpl_var name='seconds_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="minimum">{tmpl_var name='minimum_txt'}</label>
+                <input name="minimum" id="minimum" value="{tmpl_var name='minimum'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;{tmpl_var name='seconds_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />&nbsp;{tmpl_var name='seconds_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="xfer">{tmpl_var name='xfer_txt'}</label>
+                <input name="xfer" id="xfer" value="{tmpl_var name='xfer'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="also_notify">{tmpl_var name='also_notify_txt'}</label>
+                <input name="also_notify" id="also_notify" value="{tmpl_var name='also_notify'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="update_acl">{tmpl_var name='update_acl_txt'}</label>
+                <input name="update_acl" id="update_acl" value="{tmpl_var name='update_acl'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="serial" type="hidden" value="{tmpl_var name='serial'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#xfer').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });
+    jQuery('#also_notify').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_soa_list.htm b/interface/web/themes/default-v2/templates/dns/dns_soa_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..fa09c78e0e7bf902796f2810557ba746c91a3f6d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_soa_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_dns_soa">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_soa_edit.php');"><span>{tmpl_var name="add_new_record_txt"}</span></button>
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_import.php');"><span>Import Zone File</span></button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+            <thead>
+                <tr>
+                    <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                    <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                    <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
+                    <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
+                    <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                    <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                    <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
+                    <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
+                    <td class="tbl_col_mbox"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+            </thead>
+            <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
+                        <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
+                        <td class="tbl_col_mbox"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                </tr>
+            </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_srv_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_srv_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..fbcf10db9d4eccbedeb16f219d9dd3fc923c0754
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_srv_edit.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_srv">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="target">{tmpl_var name='target_txt'}</label>
+                <input name="target" id="target" value="{tmpl_var name='target'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="weight">{tmpl_var name='weight_txt'}</label>
+                <input name="weight" id="weight" value="{tmpl_var name='weight'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="port">{tmpl_var name='port_txt'}</label>
+                <input name="port" id="port" value="{tmpl_var name='port'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="aux">{tmpl_var name='aux_txt'}</label>
+                <input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_srv_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_template_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_template_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b18d84a691d1c52cba2a16dd18ba563c9bbef7d2
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_template_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_template">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='fields_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='fields'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="template">{tmpl_var name='template_txt'}</label>
+                <textarea name="template" id="template" rows='15' cols='40'>{tmpl_var name='template'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='visible_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='visible'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_template_list.htm b/interface/web/themes/default-v2/templates/dns/dns_template_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7039d34b106220ea8a38639972743660cc568111
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_template_list.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_dns_template">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_template_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_visible" scope="col"><tmpl_var name="visible_txt"></th>
+                        <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_visible"><select name="search_visible">{tmpl_var name='search_visible'}</select></td>
+                        <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_visible"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="visible"}</a></td>
+                        <td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_txt_edit.htm b/interface/web/themes/default-v2/templates/dns/dns_txt_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0450fc865f689c4d917b2b93c117946d028cdcdb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_txt_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_dns_txt">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
+                <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="zone" value="{tmpl_var name='zone'}">
+        <input type="hidden" name="type" value="{tmpl_var name='type'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','dns/dns_txt_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/dns/dns_wizard.htm b/interface/web/themes/default-v2/templates/dns/dns_wizard.htm
new file mode 100644
index 0000000000000000000000000000000000000000..51d9b76147c398f10a18112a50c414c1951c59b1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/dns/dns_wizard.htm
@@ -0,0 +1,95 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<tmpl_if name="error">
+    <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+</tmpl_if>
+
+<div class="panel panel_dns_wizard">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend><tmpl_var name="dns_zone_txt"></legend>
+            <div class="ctrlHolder">
+                <label for="template_id">{tmpl_var name='template_id_txt'}</label>
+                <select name="template_id" id="template_id" class="selectInput" onChange="submitForm('pageForm','dns/dns_wizard.php')">
+                    {tmpl_var name='template_id_option'}
+                </select>
+            </div>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                    <select name="server_id" id="server_id" class="selectInput">
+                        {tmpl_var name='server_id'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="DOMAIN_VISIBLE">
+                <div class="ctrlHolder">
+                    <label for="domain">{tmpl_var name='domain_txt'}</label>
+                    <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+                </div>
+            </tmpl_if>
+            <tmpl_if name="IP_VISIBLE">
+                <div class="ctrlHolder">
+                    <label for="ip">{tmpl_var name='ip_txt'}</label>
+                    <input name="ip" id="ip" value="{tmpl_var name='ip'}" size="30" maxlength="255" type="text" class="textInput" />
+                </div>
+            </tmpl_if>
+            <tmpl_if name="NS1_VISIBLE">
+                <div class="ctrlHolder">
+                    <label for="ns1">{tmpl_var name='ns1_txt'}</label>
+                    <input name="ns1" id="ns1" value="{tmpl_var name='ns1'}" size="30" maxlength="255" type="text" class="textInput" />
+                </div>
+            </tmpl_if>
+            <tmpl_if name="NS2_VISIBLE">
+                <div class="ctrlHolder">
+                    <label for="ns2">{tmpl_var name='ns2_txt'}</label>
+                    <input name="ns2" id="ns2" value="{tmpl_var name='ns2'}" size="30" maxlength="255" type="text" class="textInput" />
+                </div>
+            </tmpl_if>
+            <tmpl_if name="EMAIL_VISIBLE">
+                <div class="ctrlHolder">
+                    <label for="email">{tmpl_var name='email_txt'}</label>
+                    <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+                </div>
+            </tmpl_if>
+        </fieldset>
+            
+        <input type="hidden" name="create" value="0" />
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onClick="document.pageForm.create.value=1; submitForm('pageForm','dns/dns_wizard.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#ip').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });	
+</script>
diff --git a/interface/web/themes/default-v2/templates/domain/domain_edit.htm b/interface/web/themes/default-v2/templates/domain/domain_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..75c464a03c96d9956fc0626010d9da7aaaa1c65c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/domain/domain_edit.htm
@@ -0,0 +1,40 @@
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <tmpl_if name="edit_disabled">
+                <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" disabled="disabled" />
+                <tmpl_else>
+                <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+                </tmpl_if>
+            </div>
+            <tmpl_if name="is_admin">
+            <div class="ctrlHolder">
+                <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                <tmpl_if name="edit_disabled">
+                <select name="client_group_id" id="client_group_id" class="selectInput" disabled="disabled">
+                    {tmpl_var name='client_group_id'}
+                </select>
+                <tmpl_else>
+                <select name="client_group_id" id="client_group_id" class="selectInput">
+                    {tmpl_var name='client_group_id'}
+                </select>
+                </tmpl_if>
+            </div>
+            </tmpl_if>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="local">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','domain/domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('domain/domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/domain/domain_list.htm b/interface/web/themes/default-v2/templates/domain/domain_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..96894fa763e0f4595aa7560671f9e2b51e742736
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/domain/domain_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_domain">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <tmpl_if name="is_admin">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('domain/domain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+                <tmpl_else>
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('domain/domain_new_client.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+                </tmpl_if>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+            <thead>
+                <tr>
+                    <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                    <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="user_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                    <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','domain/domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+            </thead>
+            <tbody>
+                <tmpl_loop name="records">
+                <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                    <td class="tbl_col_domain"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                    <td class="tbl_col_sys_groupid"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
+                    <td class="tbl_col_buttons">
+                        <tmpl_if name="is_admin">
+                        <div class="buttons icons16">    
+                            <a class="icons16 icoDelete" href="javascript: del_record('domain/domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                        </div>
+                        </tmpl_if>
+                    </td>
+                </tr>
+                </tmpl_loop>
+            </tbody>
+
+            <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                </tr>
+            </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/error.tpl.htm b/interface/web/themes/default-v2/templates/error.tpl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..d75fda4006ba30a636f9d63159a8fffab3c84139
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/error.tpl.htm
@@ -0,0 +1,8 @@
+<div class="uniForm">
+    <div id="errorMsg">
+        <h3>Error</h3>
+        <ol>
+            <li>###ERRORMSG###</li>
+        </ol>
+    </div>
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/form.tpl.htm b/interface/web/themes/default-v2/templates/form.tpl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..429bfd9f2497cae91ebd8b996f6897c6950ee1c0
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/form.tpl.htm
@@ -0,0 +1 @@
+<tmpl_dyninclude name="content_tpl">
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/faq_edit.htm b/interface/web/themes/default-v2/templates/help/faq_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6513f95508367fa274c7c3b203533ff375dd43ce
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/faq_edit.htm
@@ -0,0 +1,29 @@
+<div class="panel panel_support_message">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='faq_faq_txt'}</legend>
+            <div class="ctrlHolder">
+                <label for="hf_section">{tmpl_var name='faq_section_txt'}</label>
+                <select name="hf_section" id="hf_section" class="selectInput">
+                    {tmpl_var name='hf_section'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="hf_question">{tmpl_var name='faq_question_txt'}</label>
+                <input name="hf_question" id="hf_question" value="{tmpl_var name='hf_question'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="hf_answer">{tmpl_var name='faq_answer_txt'}</label>
+                <textarea name="hf_answer" id="hf_answer" rows='10' cols='30'>{tmpl_var name='hf_answer'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','help/faq_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('help/faq_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/faq_manage_questions_list.htm b/interface/web/themes/default-v2/templates/help/faq_manage_questions_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c045dfbb1be5c039f1db3c9483d62011ac766c15
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/faq_manage_questions_list.htm
@@ -0,0 +1,43 @@
+<h2>{tmpl_var name="faq_faq_questions_txt"}</h2>
+<div class="panel panel_support_message">
+    
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onclick="loadContent('help/faq_edit.php');">
+                    <span>{tmpl_var name="faq_new_question_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="faq_sections_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col">{tmpl_var name="faq_question_txt"}</th>
+                        <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
+                        <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
+                        <th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
+                    </tr>
+                </thead>
+                <tmpl_loop name="records">
+                    <tr>
+                        <td>{tmpl_var name='hf_question'}</td>
+                        <td>{tmpl_var name='hf_section'}</td>
+                        <td>
+                            <div class="buttons icons16">
+                                <a class="icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">
+                                    <span>{tmpl_var name="faq_delete_txt"}</span></a> </div>
+                        </td>
+                        <td>
+                            <a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/faq_sections_edit.htm b/interface/web/themes/default-v2/templates/help/faq_sections_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..181364bdc2478b15928ea53e9420c4a3a9153f49
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/faq_sections_edit.htm
@@ -0,0 +1,20 @@
+<div class="panel panel_support_message">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Section</legend>
+            <div class="ctrlHolder">
+                <label for="hfs_name">{tmpl_var name='faq_section_name_txt'}</label>
+                <input name="hfs_name" id="hfs_name" value="{tmpl_var name='hfs_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','help/faq_sections_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('help/faq_sections_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+
diff --git a/interface/web/themes/default-v2/templates/help/help_faq_list.htm b/interface/web/themes/default-v2/templates/help/help_faq_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6af928f7676e2479e7d9c6865c4ff7c95a69da1d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/help_faq_list.htm
@@ -0,0 +1,19 @@
+<tmpl_loop name="records">
+    <h3>{tmpl_var name='hf_question'}
+    </h3>
+    <p>
+        {tmpl_var name='hf_answer'}
+    </p>
+    <tmpl_if name='is_admin'>
+        <div class="buttons icons16">
+            <a class="icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>Delete</span></a>
+        </div>
+        <a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="edit_txt"}</a>
+        <br/>
+        <br/>
+        <br/>
+    </tmpl_if>
+
+</tmpl_loop>
+
+<!--<tmpl_var name="paging">-->
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/help_faq_sections_list.htm b/interface/web/themes/default-v2/templates/help/help_faq_sections_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ddb1a560e10705ed672000cc1cfb37e55cd4afcd
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/help_faq_sections_list.htm
@@ -0,0 +1,43 @@
+<h2><tmpl_var name="faq_faq_sections_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_support_faq_section">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onclick="loadContent('help/faq_sections_edit.php');">
+                    <span>{tmpl_var name="faq_new_section_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="faq_sections_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
+                        <th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
+                        <th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
+                    </tr>
+                </thead>
+                <tmpl_loop name="records">
+                    <tr>
+                        <td><b>{tmpl_var name='hfs_name'}</b></td>
+                        <td>
+                            <div class="buttons icons16">
+                                <a class="icons16 icoDelete" href="javascript: del_record('help/faq_sections_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">
+                                    <span>{tmpl_var name="faq_delete_txt"}</span></a> </div>
+                        </td><td>
+
+                            <a href="#" onClick="loadContent('help/faq_sections_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/support_message_edit.htm b/interface/web/themes/default-v2/templates/help/support_message_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..06c17977fa4ec2ba1b43139fbf6ed75ce3ba9632
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/support_message_edit.htm
@@ -0,0 +1,33 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_support_message">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Message</legend>
+            <div class="ctrlHolder">
+                <label for="recipient_id">{tmpl_var name='recipient_id_txt'}</label>
+                <select name="recipient_id" id="recipient_id" class="selectInput">
+                    {tmpl_var name='recipient_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="subject">{tmpl_var name='subject_txt'}</label>
+                <input name="subject" id="subject" value="{tmpl_var name='subject'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="message">{tmpl_var name='message_txt'}</label>
+                <textarea name="message" id="message" rows='10' cols='30'>{tmpl_var name='message'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="tstamp" value="{tmpl_var name='tstamp'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','help/support_message_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('help/support_message_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/support_message_list.htm b/interface/web/themes/default-v2/templates/help/support_message_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e828fe9e5750d4a53f38525fe69c26c08657f504
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/support_message_list.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_support_message">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('help/support_message_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_sender_id" scope="col"><tmpl_var name="sender_id_txt"></th>
+                        <th class="tbl_col_subject" scope="col"><tmpl_var name="subject_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_sender_id"><select name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td>
+                        <td class="tbl_col_subject"><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','help/support_message_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_sender_id"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sender_id"}</a></td>
+                            <td class="tbl_col_subject"><a href="#" onClick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="subject"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('help/support_message_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/help/support_message_view.htm b/interface/web/themes/default-v2/templates/help/support_message_view.htm
new file mode 100644
index 0000000000000000000000000000000000000000..62f2736ec94d686e31defc7ac0191b647c30be8e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/help/support_message_view.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_support_message">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Message</legend>
+            <div class="ctrlHolder">
+                <label for="subject">{tmpl_var name='subject_txt'}</label>
+                <p>{tmpl_var name='subject'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="message">{tmpl_var name='message_txt'}</label>
+                <p>{tmpl_var name='message'}</p>
+            </div>
+        </fieldset>
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='reply_txt'}" onClick="loadContent('help/support_message_edit.php?reply={tmpl_var name='id'}');"><span>{tmpl_var name='reply_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/listpage.tpl.htm b/interface/web/themes/default-v2/templates/listpage.tpl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..429bfd9f2497cae91ebd8b996f6897c6950ee1c0
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/listpage.tpl.htm
@@ -0,0 +1 @@
+<tmpl_dyninclude name="content_tpl">
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/login/index.htm b/interface/web/themes/default-v2/templates/login/index.htm
new file mode 100644
index 0000000000000000000000000000000000000000..39cbc7dd54c89b649e7cc9245ac25192529d47de
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/login/index.htm
@@ -0,0 +1,33 @@
+<h2>Login</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_login">
+
+    <tmpl_if name="msg">
+        <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+    </tmpl_if>
+    <tmpl_if name="error">
+        <div id="errorMsg"><h3>ERROR</h3><ol><li><tmpl_var name="error"></li></ol><br /><a href="#" onclick="loadContent('login/password_reset.php');">{tmpl_var name='pw_lost_txt'}</a></div>
+    </tmpl_if>
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='login_txt'}Login</legend>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput"  onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="passwort">{tmpl_var name='password_txt'}</label>
+                <input name="passwort" id="passwort" value="" size="30" maxlength="255" type="password" class="textInput"  onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
+            </div>			
+        </fieldset>
+
+        <input type="hidden" name="s_mod" value="login" />
+        <input type="hidden" name="s_pg" value="index" />
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoKey" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitLoginForm('pageForm');"><span>{tmpl_var name='login_button_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/login/password_reset.htm b/interface/web/themes/default-v2/templates/login/password_reset.htm
new file mode 100644
index 0000000000000000000000000000000000000000..3b235eb57f9281edd8a941deba5fe795974c805c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/login/password_reset.htm
@@ -0,0 +1,33 @@
+<h2>Password Reset</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_password_reset">
+  
+    <tmpl_if name="msg">
+        <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+    </tmpl_if>
+    <tmpl_if name="error">
+        <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+    </tmpl_if>
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name='pw_reset_txt'}</legend>
+            <div class="ctrlHolder">
+                <label for="email"><em>*</em> {tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="username"><em>*</em> {tmpl_var name='username_txt'}</label>
+                <input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput" />
+            </div>			
+        </fieldset>
+
+        <input type="hidden" name="s_mod" value="login" />
+        <input type="hidden" name="s_pg" value="index" />
+
+        <div class="buttonHolder buttons">
+            <button class="positive" type="button" value="{tmpl_var name="add_new_record_txt"}" onClick="submitForm('pageForm','login/password_reset.php');"><span>{tmpl_var name='pw_button_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_alias_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_alias_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0aa550f9aae3b474f8bcd7d184bb8604d37f0174
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_alias_edit.htm
@@ -0,0 +1,39 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_alias">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
+                <div class="multiField">
+                    <label for="email_local_part" class="blockLabel">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
+                    <label for="email_at" class="blockLabel email_at">&nbsp;<span id="email_at" name="email_at" />@</label>
+                    <label for="email_domain" class="blockLabel">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <select name="destination" id="destination" class="selectInput">
+                    {tmpl_var name='destination'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="alias">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_alias_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_alias_list.htm b/interface/web/themes/default-v2/templates/mail/mail_alias_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..92755ddb9fff7536a5238f89cacfb71d79b6e065
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_alias_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_alias">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_alias_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_alias_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+                            <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_alias_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c41121b7bd736d78c92af6e25b4a92e331de5964
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_aliasdomain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='source_txt'}</label>
+                <select name="source" id="source" class="selectInput">
+                    {tmpl_var name='source_domain'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <select name="destination" id="destination" class="selectInput">
+                    {tmpl_var name='destination_domain'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="aliasdomain">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_list.htm b/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..d75c236e6479c9f0e849dfe1b690644be845e4fa
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_aliasdomain_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_aliasdomain">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_aliasdomain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_blacklist_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_blacklist_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..493e88b90aa6e610438aeae6bf678e524ab1ca43
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_blacklist_edit.htm
@@ -0,0 +1,41 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_blacklist">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="source">{tmpl_var name='source_txt'}</label>
+                <input name="source" id="source" value="{tmpl_var name='source'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="access" type="hidden" value="{tmpl_var name='access'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_blacklist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_blacklist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_blacklist_list.htm b/interface/web/themes/default-v2/templates/mail/mail_blacklist_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6dd81c62c59318fc69c6843cab4bdc8501b2dd7c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_blacklist_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_blacklist">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_blacklist_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_content_filter_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_content_filter_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..8dc53e16ab8193713a4324f9dc920c6d1edcf28a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_content_filter_edit.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_content_filter">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="pattern">{tmpl_var name='pattern_txt'}</label>
+                <input name="pattern" id="pattern" value="{tmpl_var name='pattern'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="data">{tmpl_var name='data_txt'}</label>
+                <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="action">{tmpl_var name='action_txt'}</label>
+                <select name="action" id="action" class="selectInput">
+                    {tmpl_var name='action'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_content_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_content_filter_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_content_filter_list.htm b/interface/web/themes/default-v2/templates/mail/mail_content_filter_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..fda80a6cc141ff969ce94dff2f380a31411b5906
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_content_filter_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_content_filter">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_content_filter_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_pattern" scope="col"><tmpl_var name="pattern_txt"></th>
+                        <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_pattern"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></td>
+                        <td class="tbl_col_action"><select name="search_action">{tmpl_var name='search_action'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_content_filter_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_pattern"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="pattern"}</a></td>
+                            <td class="tbl_col_action"><a href="#" onClick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="action"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_content_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_admin_list.htm b/interface/web/themes/default-v2/templates/mail/mail_domain_admin_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..4b26fb14c7cbb5a6b70bad3ba096213237f6782e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_domain_admin_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_domain_admin">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_sys_groupid"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b6b9223fcf5d5994811a15fd34a14ca8af4433bb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_edit.htm
@@ -0,0 +1,36 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_domain_catchall">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='email_txt'}</p>
+                <div class="multiField">
+                    <label for="email_at" class="blockLabel email_at">&nbsp;<span id="email_at" name="email_at" />@</label>
+                    <label for="email_domain" class="blockLabel">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <input name="destination" id="destination" value="{tmpl_var name='destination'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="catchall">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_domain_catchall_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_domain_catchall_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_list.htm b/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..d608425ddb16c27c8e7ab5ad280d21721cda7ccd
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_domain_catchall_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_domain_catchall">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_catchall_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_catchall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_domain_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b84e2d61cba0e79ad73d44a012f28571a7df83b3
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_domain_edit.htm
@@ -0,0 +1,73 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <tmpl_if name="domain_option">
+                    <select name="domain" id="domain" class="selectInput">
+                        {tmpl_var name='domain_option'}
+                    </select>
+                    <tmpl_else>
+                        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="policy">{tmpl_var name='policy_txt'}</label>
+                <select name="policy" id="policy" class="selectInput">
+                    {tmpl_var name='policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="local">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_domain_list.htm b/interface/web/themes/default-v2/templates/mail/mail_domain_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..958f7430043af1860451dd5a0ae80d83b1a86e54
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_domain_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_domain">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_domain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_forward_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_forward_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..d0a85033f645f9bb712df76a6d68422ae3cafdea
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_forward_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_forward">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
+                <div class="multiField">
+                    <label for="email_local_part" class="blockLabel">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
+                    <label for="email_at" class="blockLabel email_at">&nbsp;<span id="email_at" name="email_at" />@</label>
+                    <label for="email_domain" class="blockLabel">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <textarea rows="10" cols="40" name="destination" id="destination" type="text" class="textInput">{tmpl_var name='destination'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="type" value="forward">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_forward_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_forward_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_forward_list.htm b/interface/web/themes/default-v2/templates/mail/mail_forward_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..24a0538802aff71f7c5c09125c20f8c347a616d8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_forward_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_forward">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_forward_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_forward_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_forward_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_get_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_get_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..1ba3f9e8f1c137a6c19ed839e819b78b23cadc6c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_get_edit.htm
@@ -0,0 +1,60 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_get">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="source_server">{tmpl_var name='source_server_txt'}</label>
+                <input name="source_server" id="source_server" value="{tmpl_var name='source_server'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="source_username">{tmpl_var name='source_username_txt'}</label>
+                <input name="source_username" id="source_username" value="{tmpl_var name='source_username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="source_password">{tmpl_var name='source_password_txt'}</label>
+                <input name="source_password" id="source_password" value="{tmpl_var name='source_password'}" size="30" maxlength="255" type="password" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='source_delete_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='source_delete'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='source_read_all_txt'}</p>
+                <div class="multiField">        
+                    {tmpl_var name='source_read_all'} 
+                </div>                          
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <select name="destination" id="destination" class="selectInput">
+                    {tmpl_var name='destination'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_get_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_get_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_get_list.htm b/interface/web/themes/default-v2/templates/mail/mail_get_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2997bf77c52c9e6a941e659293a828b265663a3b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_get_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_get">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_get_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_source_server" scope="col"><tmpl_var name="source_server_txt"></th>
+                        <th class="tbl_col_source_username" scope="col"><tmpl_var name="source_username_txt"></th>
+                        <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_source_server"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></td>
+                        <td class="tbl_col_source_username"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></td>
+                        <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_get_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_source_server"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_server"}</a></td>
+                            <td class="tbl_col_source_username"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_username"}</a></td>
+                            <td class="tbl_col_destination"><a href="#" onClick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_get_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e5b335c699d069afc2e4fe86c7781c813bf62ad0
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_mailinglist_edit.htm
@@ -0,0 +1,86 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_mailinglist">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Mailing List</legend>	
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+
+            <tmpl_if name="edit_disabled">
+                <div class="ctrlHolder">
+                    <label for="domain_disabled">{tmpl_var name='domain_txt'}</label>
+                    <select name="domain_disabled" id="domain_disabled" class="selectInput" disabled="disabled">
+                        {tmpl_var name='domain_option'}
+                    </select>
+                    <input type="hidden" name="domain" value="{tmpl_var name='domain_value'}" />
+                </div>
+
+                <div class="ctrlHolder">
+                    <label for="listname_disabled">{tmpl_var name='listname_txt'}</label>
+                    <input name="listname_disabled" id="listname_disabled" value="{tmpl_var name='listname'}" size="30" maxlength="255" type="text" class="textInput" disabled="disabled" />
+                    <input type="hidden" name="listname" value="{tmpl_var name='listname_value'}" />
+                </div>
+                <div class="ctrlHolder">
+                    <label for="email_disabled">{tmpl_var name='email_txt'}</label>
+                    <input name="email_disabled" id="email_disabled" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" disabled="disabled" />
+                    <input type="hidden" name="email" value="{tmpl_var name='email_value'}" />
+                </div>
+                <tmpl_else>
+                    <div class="ctrlHolder">
+                        <label for="domain">{tmpl_var name='domain_txt'}</label>
+                        <select name="domain" id="domain" class="selectInput">
+                            {tmpl_var name='domain_option'}
+                        </select>
+                    </div>
+                    <div class="ctrlHolder">
+                        <label for="listname">{tmpl_var name='listname_txt'}</label>
+                        <input name="listname" id="listname" value="{tmpl_var name='listname'}" size="30" maxlength="255" type="text" class="textInput" />
+                    </div>
+                    <div class="ctrlHolder">
+                        <label for="email">{tmpl_var name='email_txt'}</label>
+                        <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+                    </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_mailinglist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_mailinglist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/mail/mail_mailinglist_list.htm b/interface/web/themes/default-v2/templates/mail/mail_mailinglist_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cbb572f746c372d41314e39ae535625c69b70aae
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_mailinglist_list.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_mailinglist">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_mailinglist_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_listname" scope="col"><tmpl_var name="listname_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_listname"><input type="text" name="search_listname" value="{tmpl_var name='search_listname'}" /></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_mailinglist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_listname"><a href="#" onClick="loadContent('mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="listname"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">
+                                                    <tmpl_if name="mailmailinglist_link"><a class="icons16 icoWebmailer" href="mail/mailinglist.php?id={tmpl_var name='id'}" target="mailmailinglist"><span>{tmpl_var name='delete_txt'}</span></a></tmpl_if>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_mailinglist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..60ac345134b5f351c4495628b8ecee1146ef21d4
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_edit.htm
@@ -0,0 +1,35 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_relay_recipient">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Relay recipient</legend>
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="source">{tmpl_var name='source_txt'}</label>
+                <input name="source" id="source" value="{tmpl_var name='source'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="access" value="OK">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_relay_recipient_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_relay_recipient_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_list.htm b/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7aeb45f7dc4f39c8a22cc3ef116e322dc0a40948
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_relay_recipient_list.htm
@@ -0,0 +1,55 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mail_relay_recipient">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+        <div class="buttons">
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_relay_recipient_edit.php');">
+            <span>{tmpl_var name="add_new_record_txt"}</span>
+            </button>
+        </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_relay_recipient_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_relay_recipient_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_transport_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_transport_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0bb8dfaf371378f67494296869f536925a55e415
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_transport_edit.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_transport">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput formLengthHalf">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='mx_txt'}</p>
+                <div class="multiField">
+                    <input type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="destination">{tmpl_var name='destination_txt'}</label>
+                <input name="destination" id="transport" value="{tmpl_var name='destination'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="sort_order">{tmpl_var name='sort_order_txt'}</label>
+                <select name="sort_order" id="sort_order" class="selectInput formLengthHalf">
+                    {tmpl_var name='sort_order'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_transport_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_transport_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_transport_list.htm b/interface/web/themes/default-v2/templates/mail/mail_transport_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..3f56fb5d2358d4ce93af209876bd318dc753e6a7
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_transport_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_transport">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_transport_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_transport" scope="col"><tmpl_var name="transport_txt"></th>
+                        <th class="tbl_col_sort_order" scope="col"><tmpl_var name="sort_order_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_transport"><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></td>
+                        <td class="tbl_col_sort_order"><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_transport_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_transport"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="transport"}</a></td>
+                            <td class="tbl_col_sort_order"><a href="#" onClick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sort_order"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_transport_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_autoresponder_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_user_autoresponder_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..da6edd48df565fc34be9327e5f811dcb7b02291b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_autoresponder_edit.htm
@@ -0,0 +1,44 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_user">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="autoresponder_subject">{tmpl_var name='autoresponder_subject_txt'}</label>
+                <input type="text" name="autoresponder_subject" id="autoresponder_subject" maxlength='250' value="{tmpl_var name='autoresponder_subject'}" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>
+                <textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder">{tmpl_var name='autoresponder_active'}</label>
+                <input type="checkbox" value="y" id="autoresponder" name="autoresponder"
+                       onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_start_date">{tmpl_var name='autoresponder_start_date_txt'}</label>
+                {tmpl_var name='autoresponder_start_date'}&nbsp;
+                <a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_end_date">{tmpl_var name='autoresponder_end_date_txt'}</label>
+                {tmpl_var name='autoresponder_end_date'}
+            </div>
+        </fieldset>
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button"
+                    value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');">
+                <span>{tmpl_var name='btn_save_txt'}</span>
+            </button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}"
+                    onClick="loadContent('mail/mail_user_list.php');">
+                <span>{tmpl_var name='btn_cancel_txt'}</span>
+            </button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_custom_rules_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_user_custom_rules_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..78c87ebc046682efa3788644c5818647e596a813
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_custom_rules_edit.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="custom_mailfilter">{tmpl_var name='custom_mailfilter_txt'}</label>
+                <textarea name="custom_mailfilter" id="custom_mailfilter" rows='15' cols='30'>{tmpl_var name='custom_mailfilter'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_filter_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_user_filter_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..694b61876562675c14c9a24f649f96349c9bf28e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_filter_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_user_filter">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="rulename" class="wf_preField">{tmpl_var name='rulename_txt'}</label>
+                <input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" size="30" maxlength="255"  class="textInput">
+            </div>
+            <div class="ctrlHolder">
+                <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
+                <select id="source" name="source"  class="textInput formLengthHalf">{tmpl_var name='source'}</select>
+                <select id="op" name="op"  class="textInput formLengthHalf">{tmpl_var name='op'}</select>
+                <input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255"  class="textInput">
+            </div>
+            <div class="ctrlHolder">
+                <label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
+                <select id="action" name="action" class="textInput formLengthHalf">{tmpl_var name='action'}</select>
+                <input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255"  class="textInput formLengthHalf">
+            </div>
+            <div class="ctrlHolder">
+                <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+                <span class="">{tmpl_var name='active'}</span>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="mailuser_id" type="hidden" value="{tmpl_var name='mailuser_id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='mailuser_id'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_filter_list.htm b/interface/web/themes/default-v2/templates/mail/mail_user_filter_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f270944bbe4e779c74b385d78633073f0d9f6d22
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_filter_list.htm
@@ -0,0 +1,44 @@
+
+<div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+        <div class="buttons">
+            <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
+                <span>{tmpl_var name="add_new_record_txt"}</span>
+            </button>
+        </div>
+    </fieldset>
+</div>
+
+<div class="pnl_listarea">
+    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+        <table class="list">
+            <thead>
+                <tr>
+                    <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
+                    <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('filter_records','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+            </thead>
+            <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mail/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                </tr>
+            </tfoot>
+        </table>
+    </fieldset>
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_list.htm b/interface/web/themes/default-v2/templates/mail/mail_user_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..a9999bdb47cbb2f4f16838654905137009042a22
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_list.htm
@@ -0,0 +1,66 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_user">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                <tmpl_if name="enable_custom_login"><th class="tbl_col_login" scope="col"><tmpl_var name="login_txt"></th></tmpl_if>
+                <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                                    <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+            <tmpl_if name="enable_custom_login"><td class="tbl_col_login"><input type="text" name="search_login" value="{tmpl_var name='search_login'}" /></td></tmpl_if>
+                        <td class="tbl_col_autoresponder"><input type="text" name="search_autoresponder" value="{tmpl_var name='search_autoresponder'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                        <tmpl_if name="enable_custom_login">
+                            <td class="tbl_col_login">
+                                <a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="login"}</a>
+                            </td>
+                        </tmpl_if>
+                        <td class="tbl_col_name"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                        <td class="tbl_col_autoresponder"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <tmpl_if name="mailboxlist_webmail_link">
+                                    <a class="icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </tmpl_if>
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="<tmpl_if name="enable_custom_login">5<tmpl_else>4</tmpl_if>"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..faba29d47dbeff4d669520c8dd6d3abe39f58037
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_mailbox_edit.htm
@@ -0,0 +1,81 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='name_txt'}</label>
+                <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" /> &nbsp; {tmpl_var name='name_optional_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
+                <div class="multiField">
+                    <label for="email_local_part" class="blockLabel formLengthEmailDomain">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
+                    <label for="email_at" class="blockLabel email_at">&nbsp;<span id="email_at" name="email_at" />@</label>
+                    <label for="email_domain" class="blockLabel formLengthEmailDomain">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+                </div>
+            </div>
+            <tmpl_if name="enable_custom_login"><div class="ctrlHolder">
+                    <label for="login">{tmpl_var name='login_txt'}</label>
+                    <input type="text" id="login" name="login" size="20" value="{tmpl_var name='login'}" class="textInput" /></label>
+                </div></tmpl_if>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="quota">{tmpl_var name='quota_txt'}</label>
+                <input name="quota" id="quota" value="{tmpl_var name='quota'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='cc_txt'}</label>
+                <input name="cc" id="cc" value="{tmpl_var name='cc'}" size="30" maxlength="255" type="text" class="textInput" /> &nbsp; {tmpl_var name='name_optional_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="policy">{tmpl_var name='policy_txt'}</label>
+                <select name="policy" id="policy" class="selectInput">
+                    {tmpl_var name='policy'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='postfix_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='postfix'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='disableimap_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='disableimap'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='disablepop3_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='disablepop3'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_mailfilter_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_user_mailfilter_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ef053c93677cb5447630e521d4781713f622b44f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_mailfilter_edit.htm
@@ -0,0 +1,26 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='move_junk_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='move_junk'}
+                </div>
+            </div>
+        </fieldset>
+
+        {tmpl_var name='filter_records'}
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_user_stats_list.htm b/interface/web/themes/default-v2/templates/mail/mail_user_stats_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2000f34b46e4e287228300ac159d930a9ffe9ff5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_user_stats_list.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_user_stats">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                        <th class="tbl_col_mail_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
+                        <th class="tbl_col_mail_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
+                        <th class="tbl_col_mail_traffic_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
+                        <th class="tbl_col_mail_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                        <td class="tbl_col_this_month"></td>
+                        <td class="tbl_col_last_month"></td>
+                        <td class="tbl_col_this_year"></td>
+                        <td class="tbl_col_last_year"></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                            <td class="tbl_col_this_month"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_month"} MB</a></td>
+                            <td class="tbl_col_last_month"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_month"} MB</a></td>
+                            <td class="tbl_col_this_year"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_year"} MB</a></td>
+                            <td class="tbl_col_last_year"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_year"} MB</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">
+                                    &nbsp;
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_whitelist_edit.htm b/interface/web/themes/default-v2/templates/mail/mail_whitelist_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cf2aeb596b8c45049a07b84beb2e298b33505c15
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_whitelist_edit.htm
@@ -0,0 +1,41 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_whitelist">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="source">{tmpl_var name='source_txt'}</label>
+                <input name="source" id="source" value="{tmpl_var name='source'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="access" type="hidden" value="{tmpl_var name='access'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_whitelist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_whitelist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/mail_whitelist_list.htm b/interface/web/themes/default-v2/templates/mail/mail_whitelist_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..219345fe08c84b4e5b7577851a9691d781a82300
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/mail_whitelist_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_mail_whitelist">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_whitelist_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
+                        <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+                        <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_source"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
+                            <td class="tbl_col_type"><a href="#" onClick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/mail_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..34c2249d4b78c6950eb2a463dbbacea462fb8228
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_edit.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_blacklist">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <!--
+                <div class="ctrlHolder">
+                    <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                    <select name="server_id" id="server_id" class="selectInput">
+                                                    {tmpl_var name='server_id'}
+                                            </select>
+                </div>
+            -->
+            <div class="ctrlHolder">
+                <label for="rid">{tmpl_var name='rid_txt'}</label>
+                <select name="rid" id="rid" class="selectInput">
+                    {tmpl_var name='rid'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="email">{tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="priority">{tmpl_var name='priority_txt'}</label>
+                <select name="priority" id="priority" class="selectInput formLengthHalf">
+                    {tmpl_var name='priority'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="wb" value="{tmpl_var name='wb'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_list.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..8a05d36a00adb4db0d2719db011ff2bc3af38083
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_blacklist_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_blacklist">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_blacklist_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+                        <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
+                        <td class="tbl_col_rid"><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
+                        <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+                            <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
+                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_getmail_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_config_getmail_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2b3c85a513b4bf3ce74e324a5e66d9a8a3082ceb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_config_getmail_edit.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_config">
+
+    <div class="pnl_formsarea">
+        <fieldset id="wf_area_spamfilter_config">
+            <span class="wf_oneField">
+                <label for="getmail_config_dir" class="wf_preField">{tmpl_var name='getmail_config_dir_txt'}</label>
+                <input type="text" id="getmail_config_dir" name="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255">
+            </span>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="wf_actions buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_list.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_config_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b84a77f9aa9f76828200e58ae1954c39bd5a344f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_config_list.htm
@@ -0,0 +1,51 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_config">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_config_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_name"><a href="#" onClick="loadContent('mail/spamfilter_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_mail_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_config_mail_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..524c9804b0a9dd45863d6c4eae2dd22b0aee66cc
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_config_mail_edit.htm
@@ -0,0 +1,66 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_config">
+
+    <div class="pnl_formsarea">
+        <fieldset id="wf_area_spamfilter_config">
+            <span class="wf_oneField">
+                <label for="module" class="wf_preField">{tmpl_var name='module_txt'}</label>
+                <select id="module" name="module">{tmpl_var name='module'}</select>
+            </span>
+            <span class="wf_oneField">
+                <label for="maildir_path" class="wf_preField">{tmpl_var name='maildir_path_txt'}</label>
+                <input type="text" id="maildir_path" name="maildir_path" value="{tmpl_var name='maildir_path'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="homedir_path" class="wf_preField">{tmpl_var name='homedir_path_txt'}</label>
+                <input type="text" id="homedir_path" name="homedir_path" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="mailuser_uid" class="wf_preField">{tmpl_var name='mailuser_uid_txt'}</label>
+                <input type="text" id="mailuser_uid" name="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="mailuser_gid" class="wf_preField">{tmpl_var name='mailuser_gid_txt'}</label>
+                <input type="text" id="mailuser_gid" name="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="mailuser_name" class="wf_preField">{tmpl_var name='mailuser_name_txt'}</label>
+                <input type="text" id="mailuser_name" name="mailuser_name" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="mailuser_group" class="wf_preField">{tmpl_var name='mailuser_group_txt'}</label>
+                <input type="text" id="mailuser_group" name="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="relayhost" class="wf_preField">{tmpl_var name='relayhost_txt'}</label>
+                <input type="text" id="relayhost" name="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="relayhost_user" class="wf_preField">{tmpl_var name='relayhost_user_txt'}</label>
+                <input type="text" id="relayhost_user" name="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="relayhost_password" class="wf_preField">{tmpl_var name='relayhost_password_txt'}</label>
+                <input type="text" id="relayhost_password" name="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="mailbox_size_limit" class="wf_preField">{tmpl_var name='mailbox_size_limit_txt'}</label>
+                <input type="text" id="mailbox_size_limit" name="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15">
+            </span>
+            <span class="wf_oneField">
+                <label for="message_size_limit" class="wf_preField">{tmpl_var name='message_size_limit_txt'}</label>
+                <input type="text" id="message_size_limit" name="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15">
+            </span>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="wf_actions buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_config_server_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_config_server_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6cdca69f3c90bac069f8786d82d078d69ec11bcb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_config_server_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_config">
+
+    <div class="pnl_formsarea">
+        <fieldset id="wf_area_spamfilter_config">
+            <span class="wf_oneField">
+                <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
+                <input type="text" id="ip_address" name="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="netmask" class="wf_preField">{tmpl_var name='netmask_txt'}</label>
+                <input type="text" id="netmask" name="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="gateway" class="wf_preField">{tmpl_var name='gateway_txt'}</label>
+                <input type="text" id="gateway" name="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="hostname" class="wf_preField">{tmpl_var name='hostname_txt'}</label>
+                <input type="text" id="hostname" name="hostname" value="{tmpl_var name='hostname'}" size="40" maxlength="255">
+            </span>
+            <span class="wf_oneField">
+                <label for="nameservers" class="wf_preField">{tmpl_var name='nameservers_txt'}</label>
+                <input type="text" id="nameservers" name="nameservers" value="{tmpl_var name='nameservers'}" size="40" maxlength="255">
+            </span>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="wf_actions buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_other_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_other_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..518be5f47717ff51ff2bfcbd4cd7b1624620f9d9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_other_edit.htm
@@ -0,0 +1,80 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_policy">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="addr_extension_virus">{tmpl_var name='addr_extension_virus_txt'}</label>
+                <input name="addr_extension_virus" id="addr_extension_virus" value="{tmpl_var name='addr_extension_virus'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="addr_extension_spam">{tmpl_var name='addr_extension_spam_txt'}</label>
+                <input name="addr_extension_spam" id="addr_extension_spam" value="{tmpl_var name='addr_extension_spam'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="addr_extension_banned">{tmpl_var name='addr_extension_banned_txt'}</label>
+                <input name="addr_extension_banned" id="addr_extension_banned" value="{tmpl_var name='addr_extension_banned'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="addr_extension_bad_header">{tmpl_var name='addr_extension_bad_header_txt'}</label>
+                <input name="addr_extension_bad_header" id="addr_extension_bad_header" value="{tmpl_var name='addr_extension_bad_header'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="warnvirusrecip">{tmpl_var name='warnvirusrecip_txt'}</label>
+                <select name="warnvirusrecip" id="warnvirusrecip" class="selectInput formLengthBool">
+                    {tmpl_var name='warnvirusrecip'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="warnbannedrecip">{tmpl_var name='warnbannedrecip_txt'}</label>
+                <select name="warnbannedrecip" id="warnbannedrecip" class="selectInput formLengthBool">
+                    {tmpl_var name='warnbannedrecip'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="warnbadhrecip">{tmpl_var name='warnbadhrecip_txt'}</label>
+                <select name="warnbadhrecip" id="warnbadhrecip" class="selectInput formLengthBool">
+                    {tmpl_var name='warnbadhrecip'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="newvirus_admin">{tmpl_var name='newvirus_admin_txt'}</label>
+                <input name="newvirus_admin" id="newvirus_admin" value="{tmpl_var name='newvirus_admin'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="virus_admin">{tmpl_var name='virus_admin_txt'}</label>
+                <input name="virus_admin" id="virus_admin" value="{tmpl_var name='virus_admin'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="banned_admin">{tmpl_var name='banned_admin_txt'}</label>
+                <input name="banned_admin" id="banned_admin" value="{tmpl_var name='banned_admin'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bad_header_admin">{tmpl_var name='bad_header_admin_txt'}</label>
+                <input name="bad_header_admin" id="bad_header_admin" value="{tmpl_var name='bad_header_admin'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_admin">{tmpl_var name='spam_admin_txt'}</label>
+                <input name="spam_admin" id="spam_admin" value="{tmpl_var name='spam_admin'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="message_size_limit">{tmpl_var name='message_size_limit_txt'}</label>
+                <input name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;Bytes
+            </div>
+            <div class="ctrlHolder">
+                <label for="banned_rulenames">{tmpl_var name='banned_rulenames_txt'}</label>
+                <input name="banned_rulenames" id="banned_rulenames" value="{tmpl_var name='banned_rulenames'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_policy_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_policy_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7279f0a68f87c0c52a971c8b62d5840dcaa6db72
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_policy_edit.htm
@@ -0,0 +1,64 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_policy">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="policy_name">{tmpl_var name='policy_name_txt'}</label>
+                <input name="policy_name" id="policy_name" value="{tmpl_var name='policy_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="virus_lover">{tmpl_var name='virus_lover_txt'}</label>
+                <select name="virus_lover" id="virus_lover" class="selectInput formLengthBool">
+                    {tmpl_var name='virus_lover'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_lover">{tmpl_var name='spam_lover_txt'}</label>
+                <select name="spam_lover" id="spam_lover" class="selectInput formLengthBool">
+                    {tmpl_var name='spam_lover'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="banned_files_lover">{tmpl_var name='banned_files_lover_txt'}</label>
+                <select name="banned_files_lover" id="banned_files_lover" class="selectInput formLengthBool">
+                    {tmpl_var name='banned_files_lover'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="bad_header_lover">{tmpl_var name='bad_header_lover_txt'}</label>
+                <select name="bad_header_lover" id="bad_header_lover" class="selectInput formLengthBool">
+                    {tmpl_var name='bad_header_lover'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="bypass_virus_checks">{tmpl_var name='bypass_virus_checks_txt'}</label>
+                <select name="bypass_virus_checks" id="bypass_virus_checks" class="selectInput formLengthBool">
+                    {tmpl_var name='bypass_virus_checks'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="bypass_banned_checks">{tmpl_var name='bypass_banned_checks_txt'}</label>
+                <select name="bypass_banned_checks" id="bypass_banned_checks" class="selectInput formLengthBool">
+                    {tmpl_var name='bypass_banned_checks'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="bypass_header_checks">{tmpl_var name='bypass_header_checks_txt'}</label>
+                <select name="bypass_header_checks" id="bypass_header_checks" class="selectInput formLengthBool">
+                    {tmpl_var name='bypass_header_checks'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_policy_list.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_policy_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..48d323f775458fc4ee4b8e761f1e00af8a04d76c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_policy_list.htm
@@ -0,0 +1,63 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_policy">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_policy_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_policy_name" scope="col"><tmpl_var name="policy_name_txt"></th>
+                        <th class="tbl_col_virus_lover" scope="col"><tmpl_var name="virus_lover_txt"></th>
+                        <th class="tbl_col_spam_lover" scope="col"><tmpl_var name="spam_lover_txt"></th>
+                        <th class="tbl_col_banned_files_lover" scope="col"><tmpl_var name="banned_files_lover_txt"></th>
+                        <th class="tbl_col_bad_header_lover" scope="col"><tmpl_var name="bad_header_lover_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_policy_name"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td>
+                        <td class="tbl_col_virus_lover"><select name="search_virus_lover">{tmpl_var name='search_virus_lover'}</select></td>
+                        <td class="tbl_col_spam_lover"><select name="search_spam_lover">{tmpl_var name='search_spam_lover'}</select></td>
+                        <td class="tbl_col_banned_files_lover"><select name="search_banned_files_lover">{tmpl_var name='search_banned_files_lover'}</select></td>
+                        <td class="tbl_col_bad_header_lover"><select name="search_bad_header_lover">{tmpl_var name='search_bad_header_lover'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_policy_name"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_name"}</a></td>
+                        <td class="tbl_col_virus_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virus_lover"}</a></td>
+                        <td class="tbl_col_spam_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="spam_lover"}</a></td>
+                        <td class="tbl_col_banned_files_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="banned_files_lover"}</a></td>
+                        <td class="tbl_col_bad_header_lover"><a href="#" onClick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="bad_header_lover"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_policy_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_quarantine_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_quarantine_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..98e9c3e4b1f68a0902de121a58451d24a4e78f7e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_quarantine_edit.htm
@@ -0,0 +1,44 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_policy">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="virus_quarantine_to">{tmpl_var name='virus_quarantine_to_txt'}</label>
+                <input name="virus_quarantine_to" id="virus_quarantine_to" value="{tmpl_var name='virus_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_quarantine_to">{tmpl_var name='spam_quarantine_to_txt'}</label>
+                <input name="spam_quarantine_to" id="spam_quarantine_to" value="{tmpl_var name='spam_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="banned_quarantine_to">{tmpl_var name='banned_quarantine_to_txt'}</label>
+                <input name="banned_quarantine_to" id="banned_quarantine_to" value="{tmpl_var name='banned_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="bad_header_quarantine_to">{tmpl_var name='bad_header_quarantine_to_txt'}</label>
+                <input name="bad_header_quarantine_to" id="bad_header_quarantine_to" value="{tmpl_var name='bad_header_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <!--
+                  <div class="ctrlHolder">
+                    <label for="clean_quarantine_to">{tmpl_var name='clean_quarantine_to_txt'}</label>
+                    <input name="clean_quarantine_to" id="clean_quarantine_to" value="{tmpl_var name='clean_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+                                    </div>
+                  <div class="ctrlHolder">
+                    <label for="other_quarantine_to">{tmpl_var name='other_quarantine_to_txt'}</label>
+                    <input name="other_quarantine_to" id="other_quarantine_to" value="{tmpl_var name='other_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
+                                    </div>
+            -->
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_taglevel_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_taglevel_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..34577c8794fadb291f9bfb2a60dc2974bec6115b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_taglevel_edit.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_policy">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="spam_tag_level">{tmpl_var name='spam_tag_level_txt'}</label>
+                <input name="spam_tag_level" id="spam_tag_level" value="{tmpl_var name='spam_tag_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_tag2_level">{tmpl_var name='spam_tag2_level_txt'}</label>
+                <input name="spam_tag2_level" id="spam_tag2_level" value="{tmpl_var name='spam_tag2_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_kill_level">{tmpl_var name='spam_kill_level_txt'}</label>
+                <input name="spam_kill_level" id="spam_kill_level" value="{tmpl_var name='spam_kill_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_dsn_cutoff_level">{tmpl_var name='spam_dsn_cutoff_level_txt'}</label>
+                <input name="spam_dsn_cutoff_level" id="spam_dsn_cutoff_level" value="{tmpl_var name='spam_dsn_cutoff_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_quarantine_cutoff_level">{tmpl_var name='spam_quarantine_cutoff_level_txt'}</label>
+                <input name="spam_quarantine_cutoff_level" id="spam_quarantine_cutoff_level" value="{tmpl_var name='spam_quarantine_cutoff_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_modifies_subj">{tmpl_var name='spam_modifies_subj_txt'}</label>
+                <select name="spam_modifies_subj" id="spam_modifies_subj" class="selectInput formLengthBool">
+                    {tmpl_var name='spam_modifies_subj'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_subject_tag">{tmpl_var name='spam_subject_tag_txt'}</label>
+                <input name="spam_subject_tag" id="spam_subject_tag" value="{tmpl_var name='spam_subject_tag'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="spam_subject_tag2">{tmpl_var name='spam_subject_tag2_txt'}</label>
+                <input name="spam_subject_tag2" id="spam_subject_tag2" value="{tmpl_var name='spam_subject_tag2'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_users_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_users_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7c96208536a6e93790a0e812f71b8f0a52d0d171
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_users_edit.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_users">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="priority">{tmpl_var name='priority_txt'}</label>
+                <select name="priority" id="priority" class="selectInput formLengthLimit">
+                    {tmpl_var name='priority'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="policy_id">{tmpl_var name='policy_id_txt'}</label>
+                <select name="policy_id" id="policy_id" class="selectInput">
+                    {tmpl_var name='policy_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="email">{tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="fullname">{tmpl_var name='fullname_txt'}</label>
+                <input name="fullname" id="fullname" value="{tmpl_var name='fullname'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="local">{tmpl_var name='local_txt'}</label>
+                <select name="local" id="local" class="selectInput formLengthBool">
+                    {tmpl_var name='local'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_users_list.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_users_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..280e7664f87d5b775e0bb0e69c78c53328b17fb6
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_users_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_users">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_users_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_local" scope="col"><tmpl_var name="local_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+                        <th class="tbl_col_policy_id" scope="col"><tmpl_var name="policy_id_txt"></th>
+                        <th class="tbl_col_fullname" scope="col"><tmpl_var name="fullname_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_local"><select name="search_local">{tmpl_var name='search_local'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
+                        <td class="tbl_col_policy_id"><select name="search_policy_id">{tmpl_var name='search_policy_id'}</select></td>
+                        <td class="tbl_col_fullname"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_local"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="local"}</a></td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+                        <td class="tbl_col_policy_id"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_id"}</a></td>
+                        <td class="tbl_col_fullname"><a href="#" onClick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="fullname"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_edit.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0d31b7af5c10030f0ece308eda86a5d22ab6ddec
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_edit.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_spamfilter_whitelist">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <!--
+                  <div class="ctrlHolder">
+                    <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                    <select name="server_id" id="server_id" class="selectInput">
+                                                    {tmpl_var name='server_id'}
+                                            </select>
+                  </div>
+            -->
+            <div class="ctrlHolder">
+                <label for="rid">{tmpl_var name='rid_txt'}</label>
+                <select name="rid" id="rid" class="selectInput">
+                    {tmpl_var name='rid'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="email">{tmpl_var name='email_txt'}</label>
+                <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="priority">{tmpl_var name='priority_txt'}</label>
+                <select name="priority" id="priority" class="selectInput formLengthHalf">
+                    {tmpl_var name='priority'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input type="hidden" name="wb" value="{tmpl_var name='wb'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_list.htm b/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6c7ff3d834a530f69249443c13bc44153409783e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/spamfilter_whitelist_list.htm
@@ -0,0 +1,63 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_spamfilter_whitelist">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/spamfilter_whitelist_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
+                        <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
+                        <td class="tbl_col_rid"><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
+                        <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_priority"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
+                            <td class="tbl_col_rid"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
+                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('mail/spamfilter_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mail/user_quota_stats_list.htm b/interface/web/themes/default-v2/templates/mail/user_quota_stats_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..3930f90f68fa6f851814bbf1aaa44188c79cec76
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mail/user_quota_stats_list.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_user_quota_stats">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
+                        <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
+                        <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
+                        <th class="" scope="col" style="text-align:right;"><tmpl_var name="quota_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_domain"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+                        <td class="tbl_col_system_user"><input type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_system_user">&nbsp;</td>
+                        <td class="tbl_col_system_user">&nbsp;</td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons">
+                                <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+                            </div>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
+                            <td class="tbl_col_used" style="text-align:right;"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
+                            <td class="tbl_col_limit" style="text-align:right;"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="quota"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    &nbsp;
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/mailuser/index.htm b/interface/web/themes/default-v2/templates/mailuser/index.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c320253e161093c39327f39b01cd15270000ca78
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/index.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="page_head_txt"></h2>
+<p><tmpl_var name="page_desc_txt"></p>
+
+<div class="panel panel_mailuser">
+
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels">
+        <div class="ctrlHolder">
+            <p class="label">{tmpl_var name='email_txt'}</p>
+            <p class="value">{tmpl_var name='email'}</p>
+        </div>
+        <div class="ctrlHolder">
+            <p class="label">{tmpl_var name='login_txt'}</p>
+            <p class="value">{tmpl_var name='login'}</p>
+        </div>
+        <div class="ctrlHolder">
+            <p class="label">{tmpl_var name='server_address_txt'}</p>
+            <p class="value">{tmpl_var name='server_name'}</p>
+        </div>
+        <div class="ctrlHolder">
+            <p class="label">{tmpl_var name='quota_txt'}</p>
+            <p class="value">{tmpl_var name='quota'}</p>
+        </div>
+        <div class="ctrlHolder">
+            <p class="label">{tmpl_var name='cc_txt'}</p>
+            <p class="value">{tmpl_var name='cc'}</p>
+        </div>
+        <div class="buttonHolder buttons">
+            &nbsp;
+        </div>
+    </fieldset>
+  </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_autoresponder_edit.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_autoresponder_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..271fca1035758bac6c97258d5e47c6202ed71ca8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_autoresponder_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mailuser_autoresponder">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="autoresponder_subject">{tmpl_var name='autoresponder_subject_txt'}</label>
+                <input type="text" name="autoresponder_subject" id="autoresponder_subject" maxlength='250' value="{tmpl_var name='autoresponder_subject'}" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>
+                <textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder">{tmpl_var name='autoresponder_active'}</label>
+                <input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_start_date">{tmpl_var name='autoresponder_start_date_txt'}</label>
+                {tmpl_var name='autoresponder_start_date'}&nbsp;
+                <a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <label for="autoresponder_end_date">{tmpl_var name='autoresponder_end_date_txt'}</label>
+                {tmpl_var name='autoresponder_end_date'}
+            </div>
+        </fieldset>
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_autoresponder_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_cc_edit.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_cc_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..089f82430118f643b6bbd063d27b2a51027a683a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_cc_edit.htm
@@ -0,0 +1,26 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mailuser_cc">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='email_txt'}</p>
+                <p class="value">{tmpl_var name='email'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="name">{tmpl_var name='cc_txt'}</label>
+                <input name="cc" id="cc" value="{tmpl_var name='cc'}" size="30" maxlength="255" type="text" class="textInput" /> &nbsp; {tmpl_var name='name_optional_txt'}
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_cc_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_edit.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..a9113c2f65023ce72a958183795316dd32d6b08e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_edit.htm
@@ -0,0 +1,38 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mailuser_filter">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="rulename" class="wf_preField">{tmpl_var name='rulename_txt'}</label>
+                <input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" size="30" maxlength="255"  class="textInput">
+            </div>
+            <div class="ctrlHolder">
+                <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
+                <select id="source" name="source"  class="textInput formLengthHalf">{tmpl_var name='source'}</select>
+                <select id="op" name="op"  class="textInput formLengthHalf">{tmpl_var name='op'}</select>
+                <input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255"  class="textInput">
+            </div>
+            <div class="ctrlHolder">
+                <label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
+                <select id="action" name="action" class="textInput formLengthHalf">{tmpl_var name='action'}</select>
+                <input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255"  class="textInput formLengthHalf">
+            </div>
+            <div class="ctrlHolder">
+                <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+                <span class="">{tmpl_var name='active'}</span>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+        <input name="mailuser_id" type="hidden" value="{tmpl_var name='mailuser_id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mailuser/mail_user_filter_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_list.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b8501e8ddee0d579964fcfbe93acb752db795a0e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_filter_list.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_mailuser_filter">
+    
+  <div class="pnl_toolsarea">
+    <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+      <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('mailuser/mail_user_filter_edit.php');">
+          <span>{tmpl_var name="add_new_record_txt"}</span>
+        </button>
+      </div>
+    </fieldset>
+  </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                    <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
+                    <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                    <td class="tbl_col_rulename"><a href="#" onClick="loadContent('mailuser/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
+                    <td class="tbl_col_buttons">
+                    <div class="buttons icons16">    
+                        <a class="icons16 icoDelete" href="javascript: del_record('mailuser/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                    </div>
+                    </td>
+                </tr>
+                </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2b91842c80b013b91e9cd16db2b0811424ad924d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_password_edit.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mailuser_password">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='email_txt'}</p>
+                <p class="value">{tmpl_var name='email'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_password_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/mailuser/mail_user_spamfilter_edit.htm b/interface/web/themes/default-v2/templates/mailuser/mail_user_spamfilter_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..eaa59e9503697b3c7b54fe011a8db724ad1134fc
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/mailuser/mail_user_spamfilter_edit.htm
@@ -0,0 +1,28 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mailuser_spamfilter">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='email_txt'}</p>
+                <p class="value">{tmpl_var name='email'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="policy">{tmpl_var name='policy_txt'}</label>
+                <select name="policy" id="policy" class="selectInput">
+                    {tmpl_var name='policy'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mailuser/mail_user_spamfilter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/main.tpl.htm b/interface/web/themes/default-v2/templates/main.tpl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e0184d19583fcf462ea431f66cc8af5d447d3036
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/main.tpl.htm
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html dir="ltr" lang="<tmpl_var name="language">-<tmpl_var name="country">">      
+    <head>
+        <!--Possible? Vars in lang= ?-->
+        <meta charset="<tmpl_var name="html_content_encoding">" />
+        <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
+        <meta http-equiv="X-UA-Compatible" content="IE=8"/>
+        <link href="themes/default-v2/css/styles.css" rel="stylesheet" media="screen" type="text/css"/>
+        <link href="themes/default-v2/css/print.css" rel="stylesheet" media="print" type="text/css"/>
+        <!--[if IE 9]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
+        <!--[if lte IE 8]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
+        <!--[if lte IE 7]><link href="themes/default-v2/css/iehacks.css" rel="stylesheet" type="text/css" /><![endif]-->
+        <link href="themes/default-v2/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
+        <link rel="shortcut icon" href="/themes/default-v2/images/favicon.ico" />
+        <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
+        <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
+        <script type="text/javascript" src="js/scrigo.js.php"></script>
+        <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
+        <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
+        <script type="text/javascript" src="js/jquery.tipsy.js"></script>
+        <script language="JavaScript" type="text/javascript">
+            var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
+            if(!is_chrome && getInternetExplorerVersion() > 8.0) {
+                var style = document.createElement('style');
+                style.innerHTML = '#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}';
+                document.getElementsByTagName("head")[0].appendChild(style);
+            }
+            
+            jQuery(document).ready(function() {
+                loadInitContent();
+                
+                $("#pageForm").submit(function(e){
+                    //Prevent form submit: e.preventDefault() in lists
+                    if ($(".panel #Filter").length > 0) {
+                        e.preventDefault();
+                    }
+                });
+                
+                jQuery('.subsectiontoggle').live("click", function(){
+                    jQuery(this).children().toggleClass('showing').end().next().slideToggle();
+                });
+                
+                jQuery('#globalsearch').ispconfigSearch({
+                    dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
+                    resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+                    noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+                    noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+                    searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">'
+                });
+                
+                jQuery('.ttip').tipsy({live: true, gravity: 'ne', html: true});
+            });
+            
+            
+            jQuery(document).bind("change", function(event) {
+                if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
+                    jQuery(".panel #Filter").trigger('click');
+                }
+            });
+            
+            jQuery(document).bind("keypress", function(event) {
+                //Use jQuery submit with keypress Enter in panel filterbar
+                if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+                    jQuery(".panel #Filter").trigger('click');
+                }
+                //Use jQuery submit with keypress Enter in forms
+                if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea') {
+                    jQuery(".pnl_formsarea button.positive:first").trigger('click');
+                }
+            });
+        </script>
+    </head>
+    <body>
+        <div id="page">
+            <!-- begin: header -->
+            <header>
+                <nav id="topsubnav">
+                    <!-- start: skip link navigation -->
+                    <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
+                    <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
+                    <!-- end: skip link navigation -->
+                    <tmpl_if name="cpuser">
+                        <a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>-->
+                        <tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
+                    </tmpl_if>
+                </nav>
+                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
+                <span>hosting control panel</span>
+            </header>
+            <!-- end: header -->
+            <a id="navigation" name="navigation"></a><!-- skiplink anchor: navigation -->
+            <!-- begin: main navigation #nav -->
+            <nav id="topNav">&nbsp;</nav>
+            <!-- end: main navigation -->
+
+            <!-- begin: main content area #main -->
+            <section id="main" name="content">
+                <nav id="sideNav" class="clearfix">&nbsp;</nav>
+                <!-- begin: #content -->
+                <section id="content">
+                    <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
+                        <div id="pageContent"><!-- AJAX CONTENT --></div>
+                    </form>
+                    <div id="ie_clearing">&nbsp;</div>
+                    <!-- End: IE Column Clearing -->
+                </section>
+                <!-- end: #content -->
+            </section>
+            <!-- end: #main -->
+            <!-- begin: footer -->
+            <footer>
+                Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
+            </footer><!-- end: footer -->
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/module.tpl.htm b/interface/web/themes/default-v2/templates/module.tpl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f8a26defc603072660ccf9fd3e8bc2bab395506f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/module.tpl.htm
@@ -0,0 +1,41 @@
+<tr>
+    <td width="128" height="26" background="themes/{tmpl_var name="theme"}/images/nav_top_bg.gif">&nbsp;</td>
+    <td rowspan="3" class="mainContent">
+        <table width="100%" height="100%" border="0" cellpadding="20" cellspacing="0">
+            <tr>
+                <td><iframe height="100%" width="100%" frameborder="0" name="content" src="{tmpl_var name="startpage"}"></iframe></td>
+            </tr>
+        </table>
+    </td>
+</tr>
+<tr>
+    <td width="128" align="right" valign="top" bgcolor="#DEE4F2">
+        <table width="128" border="0" cellspacing="0" cellpadding="2">
+            <tr>
+                <td height="10">&nbsp;</td>
+            </tr>
+            <tr>
+                <td align="center">
+                    <tmpl_loop name="nav_left">
+                        <table bgcolor="#F4F6FB" width="115">
+                            <tr>
+                                <td class="navLeftHead"><tmpl_var name="title"></td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <tmpl_loop name="items">
+                                        <a href="<tmpl_var name='link'>" class="navLeftItem" target="<tmpl_var name='target'>"><tmpl_var name="title"></a><br>
+                                    </tmpl_loop>
+                                </td>
+                            </tr>
+                        </table>
+                        <br />
+                    </tmpl_loop>
+                </td>   
+            </tr>
+        </table>
+    </td>
+</tr>
+<tr>
+    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
+</tr>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/module_tree.tpl.htm b/interface/web/themes/default-v2/templates/module_tree.tpl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..be213819d0e5ea4d992f942dc69fe6c466519e06
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/module_tree.tpl.htm
@@ -0,0 +1,42 @@
+<tr>
+    <td width="128" height="26" background="themes/{tmpl_var name="theme"}/images/nav_top_bg.gif">&nbsp;</td>
+    <td rowspan="3" class="mainContent">
+        <table width="100%" height="100%" border="0" cellpadding="20" cellspacing="0">
+            <tr>
+                <td width="200"><iframe height="100%" width="100%" frameborder="0" name="navframe" src="{tmpl_var name="navframe_page"}"></iframe></td>
+                <td><iframe height="100%" width="100%" frameborder="0" name="content" src="{tmpl_var name="startpage"}"></iframe></td>
+            </tr>
+        </table>
+    </td>
+</tr>
+<tr>
+    <td width="128" align="right" valign="top" bgcolor="#DEE4F2">
+        <table width="128" border="0" cellspacing="0" cellpadding="2">
+            <tr>
+                <td height="10">&nbsp;</td>
+            </tr>
+            <tr>
+                <td align="center">
+                    <tmpl_loop name="nav_left">
+                        <table bgcolor="#F4F6FB" width="115">
+                            <tr>
+                                <td class="navLeftHead"><tmpl_var name="title"></td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <tmpl_loop name="items">
+                                        <a href="<tmpl_var name='link'>" class="navLeftItem" target="<tmpl_var name='target'>"><tmpl_var name="title"></a><br>
+                                    </tmpl_loop>
+                                </td>
+                            </tr>
+                        </table>
+                        <br />
+                    </tmpl_loop>
+                </td>
+            </tr>
+        </table>
+    </td>
+</tr>
+<tr>
+    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
+</tr>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/monitor/datalog_list.htm b/interface/web/themes/default-v2/templates/monitor/datalog_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..158a5a84a1d7bc7f5415e495a09bf3d938dc364f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/monitor/datalog_list.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_datalog">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_tstamp" scope="col"><tmpl_var name="tstamp_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
+                        <th class="tbl_col_dbtable" scope="col"><tmpl_var name="dbtable_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_tstamp">&nbsp;</td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_action"><select name="search_action">{tmpl_var name='search_action'}</select></td>
+                        <td class="tbl_col_dbtable"><input type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/datalog_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_tstamp">{tmpl_var name="tstamp"}</td>
+                            <td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
+                            <td class="tbl_col_action">{tmpl_var name="action"}</td>
+                            <td class="tbl_col_dbtable">{tmpl_var name="dbtable"}</td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <!--<a class="icons16 icoDelete" href="javascript: del_record('monitor/datalog_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> -->
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/monitor/show_data.htm b/interface/web/themes/default-v2/templates/monitor/show_data.htm
new file mode 100644
index 0000000000000000000000000000000000000000..818208d647af29022110c60515007cb8e6ebc24f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/monitor/show_data.htm
@@ -0,0 +1,12 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_system">
+
+    <div class="pnl_formarea">
+        <fieldset><legend><tmpl_var name="monTransDate"><tmpl_var name="time"></legend>
+            <div class="systemmonitor"><tmpl_var name="output"></div>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/monitor/show_log.htm b/interface/web/themes/default-v2/templates/monitor/show_log.htm
new file mode 100644
index 0000000000000000000000000000000000000000..271d46bf59b3f7e1fde82a32244b6575cff21825
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/monitor/show_log.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_logview">
+
+    <div class="pnl_toolsarea">
+        <fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
+            <div class="buttons">
+                <div class="ctrlHolder">
+                    <label for="refreshinterval">{tmpl_var name='refreshinterval_txt'}</label>
+                    <select name="refreshinterval" id="refreshinterval" class="selectInput" onChange="loadContentRefresh('monitor/show_log.php?log={tmpl_var name="log_id"}')">
+                        {tmpl_var name='refresh'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+  
+    <div class="pnl_formarea">
+        <fieldset><legend><tmpl_var name="monTransDate"><tmpl_var name="time"></legend>
+            <div class="codeview"><tmpl_var name="log_data"></div>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/monitor/show_sys_state.htm b/interface/web/themes/default-v2/templates/monitor/show_sys_state.htm
new file mode 100644
index 0000000000000000000000000000000000000000..740141b26998f91426e3559dda7aed00839aadc8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/monitor/show_sys_state.htm
@@ -0,0 +1,25 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_sys_state">
+
+    <div class="pnl_toolsarea">
+        <fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
+            <div class="buttons">
+                <div class="ctrlHolder">
+                    <label for="refreshinterval">{tmpl_var name='refreshinterval_txt'}</label>
+                    <select name="refreshinterval" id="refreshinterval" class="selectInput withicons" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
+                        {tmpl_var name='refresh'}
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+  
+    <div class="pnl_formarea">
+        <fieldset><legend></legend>
+            <div class="stateview"><tmpl_var name="state_data"></div>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/monitor/syslog_list.htm b/interface/web/themes/default-v2/templates/monitor/syslog_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e3d18cb318164caa6558f9f57b13d37b412658b5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/monitor/syslog_list.htm
@@ -0,0 +1,56 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_syslog">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_tstamp" scope="col"><tmpl_var name="tstamp_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_loglevel" scope="col"><tmpl_var name="loglevel_txt"></th>
+                        <th class="tbl_col_message" scope="col"><tmpl_var name="message_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_tstamp">&nbsp;</td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_loglevel"><select name="search_loglevel">{tmpl_var name='search_loglevel'}</select></td>
+                        <td class="tbl_col_message"><input type="text" name="search_message" value="{tmpl_var name='search_message'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/log_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_tstamp">{tmpl_var name="tstamp"}</td>
+                            <td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
+                            <td class="tbl_col_loglevel">{tmpl_var name="loglevel"}</td>
+                            <td class="tbl_col_message">{tmpl_var name="message"}</td>
+                            <td class="tbl_col_buttons">
+                                <tmpl_if name="loglevel" op="==" value="Error">
+                                    <div class="buttons icons16">
+                                        <a class="icons16 icoDelete" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                    </div>
+                                </tmpl_if>
+                                <tmpl_if name="loglevel" op="==" value="Warning">
+                                    <div class="buttons icons16">
+                                        <a class="icons16 icoDelete" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                    </div>
+                                </tmpl_if>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                <tr>
+                    <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sidenav.tpl.htm b/interface/web/themes/default-v2/templates/sidenav.tpl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..a5051cf3a58b2bd74807b6e4799637907d8cebe1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sidenav.tpl.htm
@@ -0,0 +1,24 @@
+<ul id="submenu">
+    <tmpl_loop name="nav_left">
+        <li class="title">
+        <tmpl_if name="startpage">
+            <a href="#" onClick="loadContent('<tmpl_var name='startpage'>')">
+        </tmpl_if>
+        <tmpl_var name="title">
+            <tmpl_if name="startpage">
+                </a>
+            </tmpl_if>
+        </li>
+            <tmpl_loop name="items">
+                <li <tmpl_if name="html_id"> id='<tmpl_var name="html_id">' </tmpl_if>>
+                    <tmpl_if name="link">
+                        <a href="#" onClick="loadContent('<tmpl_var name='link'>')">
+                    </tmpl_if>
+                    <tmpl_var name="title">
+                    <tmpl_if name="link">
+                        </a>
+                    </tmpl_if>
+                </li>
+            </tmpl_loop>
+    </tmpl_loop>
+</ul>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/aps_install_package.htm b/interface/web/themes/default-v2/templates/sites/aps_install_package.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e6ce02a445cf01565835fddbbc0933b56bd227ed
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/aps_install_package.htm
@@ -0,0 +1,56 @@
+<h2>
+    {tmpl_var name='installation_txt'}: {tmpl_var name='pkg_name'} {tmpl_var name='pkg_version'}-{tmpl_var name='pkg_release'}
+    <span style="float:right">
+        <tmpl_if name='pkg_icon' op='!=' value=''>
+            <img src="{tmpl_var name='pkg_icon'}" height="32" width="32" alt="{tmpl_var name='pkg_name'}" style="vertical-align:text-bottom;" /> 
+        </tmpl_if>
+    </span>
+</h2>
+    
+<tmpl_if name='error'>
+    <div id="errorMsg"><h3>ERROR</h3><ol>{tmpl_var name='error'}</ol></div>
+</tmpl_if>
+
+<div class="panel panel_install_package">
+    
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <legend>{tmpl_var name='basic_settings_txt'}</legend>
+            <div class="ctrlHolder">
+                <label for="main_domain">{tmpl_var name='install_location_txt'}</label>
+                <div class="resetButton">http(s)://&nbsp;</div>DOMAIN_LIST_SPACE<div style="float:left;">&nbsp;/&nbsp;</div>
+                <input type="text" name="main_location" id="main_location" value="{tmpl_var name='inp_main_location'}" maxlength="255" class="textInput formLengthHalf" />
+            </div>
+            <tmpl_if name='pkg_requirements_database' op='!=' value=''>
+                <div class="ctrlHolder">
+                    <label for="main_database_password">{tmpl_var name='new_database_password_txt'}</label>
+                    <input type="text" class="textInput" name="main_database_password" id="main_database_password" value="{tmpl_var name='inp_main_database_password'}" size="10" maxlength="255" />
+                </div>
+            </tmpl_if>
+                
+            PKG_SETTINGS_SPACE
+                
+            <legend>{tmpl_var name='license_txt'}</legend>
+            <div class="ctrlHolder">
+                <label for="license">{tmpl_var name='license_txt'}</label>
+                <tmpl_if name='pkg_license_content' op='==' value=''>{tmpl_var name='pkg_license_name'}<br /></tmpl_if>
+                <tmpl_if name='pkg_license_type' op='==' value='url'>
+                    <a href="{tmpl_var name='pkg_license_content'}" target="_blank">{tmpl_var name='pkg_license_content'}</a>
+                    <tmpl_elseif name='pkg_license_content'>
+                        <textarea rows="10" cols="80" id="license_text">{tmpl_var name='pkg_license_content'}</textarea>
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="license">{tmpl_var name='acceptance_txt'}</label>
+                <input type="checkbox" name="license" id="license" <tmpl_if name='inp_license' op='==' value='true'>checked</tmpl_if> />&nbsp;&nbsp;{tmpl_var name='acceptance_text'}
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="install" value="0" />
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_install'}" name="btn_install" onClick="document.pageForm.install.value=1; submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');"><span>{tmpl_var name='btn_install'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel'}" onClick="loadContent('aps/availablepackages_list.php');"><span>{tmpl_var name='btn_cancel'}</span></button>
+        </div>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/aps_instances_list.htm b/interface/web/themes/default-v2/templates/sites/aps_instances_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..640c0bb96c8ab99e50f9efb0d225107e63cfebc9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/aps_instances_list.htm
@@ -0,0 +1,62 @@
+<h2>{tmpl_var name="list_head_txt"}</h2>
+
+<div class="panel panel_list_instances">
+    
+    <div class="pnl_listarea">
+        <fieldset><legend>{tmpl_var name="list_head_txt"}</legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_name" scope="col">{tmpl_var name='name_txt'}</th>
+                        <th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
+                        <tmpl_if name='is_noclient'>
+                        <th class="tbl_col_customer" scope="col">{tmpl_var name='customer_txt'}</th>
+                        </tmpl_if>
+                        <th class="tbl_col_installlocation" scope="col">{tmpl_var name='install_location_txt'}</th>
+                        <th class="tbl_col_instancestatus" scope="col">{tmpl_var name='status_txt'}</th>
+                        <th class="tbl_col_buttons" scope="col" >&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_version"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
+                        <tmpl_if name='is_noclient'>
+                        <td class="tbl_col_customer"><input type="text" name="search_customer_name" value="{tmpl_var name='search_customer_name'}" /></td>
+                        </tmpl_if>
+                        <td class="tbl_col_installlocation">&nbsp;</td>
+                        <td class="tbl_col_instancestatus"><select name="search_instance_status" onChange="submitForm('pageForm','sites/aps_installedpackages_list.php');">{tmpl_var name='search_instance_status'}</select></td>
+                        <td class="tbl_col_buttons">
+                        <button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_installedpackages_list.php');">
+                            <span>{tmpl_var name='filter_txt'}</span>
+                        </button>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name='records'>
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('sites/aps_packagedetails_show.php?id={tmpl_var name='package_id'}');">{tmpl_var name='package_name'}</a></td>
+                            <td class="tbl_col_version">{tmpl_var name='package_version'}-{tmpl_var name='package_release'}</td>
+                            <tmpl_if name='is_noclient'>
+                                <td class="tbl_col_customer"><a href="#" onClick="loadContent('client/client_edit.php?id={tmpl_var name='CustomerID'}');">{tmpl_var name='customer_name'}</a></td>
+                            </tmpl_if>
+                            <td class="tbl_col_installlocation"><a href="http://{tmpl_var name='install_location'}" target="_blank">{tmpl_var name='install_location_short'}</a></td>
+                            <td class="tbl_col_instancestatus"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='instance_status'}</span></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16" style="width:60px;">
+                                    <tmpl_if name='delete_possible'><a class="icons16 icoDelete" href="javascript:if(window.confirm('{tmpl_var name='pkg_delete_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='delete_txt'}</span></a></tmpl_if>
+                                    <tmpl_if name='reinstall_possible'><a class="icons16 icoEdit" href="javascript:if(window.confirm('{tmpl_var name='pkg_reinstall_confirmation'}')){ loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=reinstall_instance&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}'); }"><span>{tmpl_var name='reinstall_txt'}</span></a></tmpl_if>
+                                </div>
+                            </td>        
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6">{tmpl_var name='paging'}</td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/aps_packagedetails_show.htm b/interface/web/themes/default-v2/templates/sites/aps_packagedetails_show.htm
new file mode 100644
index 0000000000000000000000000000000000000000..351d3ac0460a708d0fdcc02d175149bd8ef3a4b5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/aps_packagedetails_show.htm
@@ -0,0 +1,139 @@
+<h2>
+    <tmpl_if name='pkg_icon' op='!=' value=''>
+        <img src="{tmpl_var name='pkg_icon'}" height="32" width="32" alt="{tmpl_var name='pkg_name'}" style="vertical-align:text-bottom;" /> 
+    </tmpl_if>
+    {tmpl_var name='pkg_name'}
+</h2>
+<b>{tmpl_var name='pkg_summary'}</b>
+<p>&nbsp;</p>
+
+<div class="pnl_toolsarea">
+    <div class="buttons">
+        <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">
+            <span>{tmpl_var name='install_package_txt'}</span>
+        </button>
+    </div>
+    <p>&nbsp;</p><p>&nbsp;</p>
+</div>
+
+
+<div class="tabbox_tabs">
+    <input type="hidden" name="next_tab" value="" />
+    <ul>
+        <li<tmpl_if name='next_tab' op='==' value='details'> class="active"</tmpl_if>>
+            <a href="javascript:changeTab('details', 'sites/aps_packagedetails_show.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='details_txt'}</a>
+        </li>
+        <tmpl_if name='pkg_screenshots'>
+        <li<tmpl_if name='next_tab' op='==' value='screenshots'> class="active"</tmpl_if>>
+            <a href="javascript:changeTab('screenshots', 'sites/aps_packagedetails_show.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='screenshots_txt'}</a>
+        </li></tmpl_if>
+        <tmpl_if name='pkg_changelog'>
+        <li<tmpl_if name='next_tab' op='==' value='changelog'> class="active"</tmpl_if>>
+            <a href="javascript:changeTab('changelog', 'sites/aps_packagedetails_show.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='changelog_txt'}</a>
+        </li></tmpl_if>
+        <li<tmpl_if name='next_tab' op='==' value='settings'> class="active"</tmpl_if>>
+            <a href="javascript:changeTab('settings', 'sites/aps_packagedetails_show.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='settings_txt'}</a>
+        </li>
+    </ul>
+</div>
+<p>&nbsp;</p>
+
+<div class="panel panel_list_packages">
+    
+    <div class="pnl_listarea">
+        <table class="list">
+            <tbody>
+                <tmpl_if name='next_tab' op='==' value='details'>
+                    <tr class="tbl_row_uneven">
+                        <td width="25%">{tmpl_var name='version_txt'}</td>
+                        <td>{tmpl_var name='pkg_version'} (Release {tmpl_var name='pkg_release'})</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='category_txt'}</td>
+                        <td>{tmpl_var name='pkg_category'}</td>
+                    </tr>
+                    <tr class="tbl_row_uneven">
+                        <td>{tmpl_var name='description_txt'}</td>
+                        <td>{tmpl_var name='pkg_description'}</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='homepage_txt'}</td>
+                        <td>
+                            <a href="{tmpl_var name='pkg_homepage'}" target="_blank">{tmpl_var name='pkg_homepage'}</a>
+                        </td>
+                    </tr>
+                    <tr class="tbl_row_uneven">
+                        <td>{tmpl_var name='installed_size_txt'}</td>
+                        <td>{tmpl_var name='pkg_installed_size'}</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='supported_languages_txt'}</td>
+                        <td>{tmpl_var name='pkg_languages'}</td>
+                    </tr>
+                    <tr class="tbl_row_uneven">
+                        <td>{tmpl_var name='config_script_txt'}</td>
+                        <td>{tmpl_var name='pkg_config_script'}</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='license_txt'}</td>
+                        <td>
+                            <tmpl_if name='pkg_license_name'>{tmpl_var name='pkg_license_name'}<br /></tmpl_if>
+                            <tmpl_if name='pkg_license_type' op='==' value='url'><a href="{tmpl_var name='pkg_license_content'}" target="_blank">{tmpl_var name='pkg_license_content'}</a>
+                            <tmpl_elseif name='pkg_license_content'>
+                                <textarea rows="10" cols="80">{tmpl_var name='pkg_license_content'}</textarea>
+                            </tmpl_if>
+                        </td>
+                    </tr>
+                <tmpl_elseif name='next_tab' op='==' value='screenshots'>
+                    <tmpl_if name='pkg_screenshots'>
+                        <tr class="tbl_row_even">
+                            <td style="text-align:center;">
+                                <tmpl_loop name='pkg_screenshots'>
+                                    <img src="{tmpl_var name='ScreenPath'}" alt="{tmpl_var name='ScreenDescription'}" /><br />
+                                    <em>{tmpl_var name='ScreenDescription'}</em><br /><br />
+                                </tmpl_loop>
+                            </td>
+                        </tr>
+                    </tmpl_if>
+                <tmpl_elseif name='next_tab' op='==' value='changelog'>
+                    <tmpl_if name='pkg_changelog'>
+                        <tr class="tbl_row_even">
+                            <td>
+                                <ul>
+                                    <tmpl_loop name='pkg_changelog'>
+                                    <li>{tmpl_var name='ChangelogVersion'}</li>
+                                <ul>
+                                    <tmpl_if name='ChangelogDescription'>
+                                    <li>{tmpl_var name='ChangelogDescription'}</li>
+                                    </tmpl_if>
+                                </ul>
+                                    </tmpl_loop>
+                                </ul>
+                            </td>
+                        </tr>
+                    </tmpl_if>
+                <tmpl_elseif name='next_tab' op='==' value='settings'>
+                    <tr class="tbl_row_uneven">
+                        <td width="25%">{tmpl_var name='php_extensions_txt'}</td>
+                        <td>{tmpl_var name='pkg_requirements_php_extensions'}</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='php_settings_txt'}</td>
+                        <td>
+                            <tmpl_loop name='pkg_requirements_php_settings'>{tmpl_var name='PHPSettingName'} = {tmpl_var name='PHPSettingValue'}<br /></tmpl_loop>
+                        </td>
+                    </tr>
+                    <tr class="tbl_row_uneven">
+                        <td>{tmpl_var name='supported_php_versions_txt'}</td>
+                        <td>{tmpl_var name='pkg_requirements_supported_php_versions'}</td>
+                    </tr>
+                    <tr class="tbl_row_even">
+                        <td>{tmpl_var name='database_txt'}</td>
+                        <td>{tmpl_var name='pkg_requirements_database'}</a></td>
+                    </tr>
+                </tmpl_if>
+            </tbody>
+        </table>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/aps_packages_list.htm b/interface/web/themes/default-v2/templates/sites/aps_packages_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e7db3e84a4e7b5313658dac83414c8a443f005f1
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/aps_packages_list.htm
@@ -0,0 +1,50 @@
+<h2>{tmpl_var name="list_head_txt"}</h2>
+
+<div class="panel panel_list_packages">
+    
+    <div class="pnl_listarea">
+        <fieldset><legend>{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'})</legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_name" scope="col">{tmpl_var name='name_txt'}</th>
+                        <th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
+                        <th class="tbl_col_category" scope="col">{tmpl_var name='category_txt'}</th>
+                            <tmpl_if name='is_admin'>
+                                <th class="tbl_col_status" scope="col">{tmpl_var name='status_txt'}</th>
+                            </tmpl_if>
+                        <th class="tbl_col_buttons" scope="col" width="60px;">&nbsp;</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+                        <td class="tbl_col_version"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
+                        <td class="tbl_col_customerid"><select name="search_category" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_category'}</select></td>
+                            <tmpl_if name='is_admin'>
+                                <td class="tbl_col_status"><select name="search_package_status" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_package_status'}</select></td>
+                            </tmpl_if>
+                        <td class="tbl_col_buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onClick="submitForm('pageForm','sites/aps_availablepackages_list.php');"><span>{tmpl_var name='filter_txt'}</span></button></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name='records'>
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_name"><a href="#" onClick="loadContent('sites/aps_packagedetails_show.php?id={tmpl_var name='id'}');">{tmpl_var name='name'}</a></td>
+                            <td class="tbl_col_version">{tmpl_var name='version'}-{tmpl_var name='release'}</td>
+                            <td class="tbl_col_category">{tmpl_var name='category'}</td>
+                                <tmpl_if name='is_admin'>
+                                    <td class="tbl_col_status"><a href="javascript:loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=change_status&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='package_status'}</span></a></td>
+                                </tmpl_if>
+                            <td>&nbsp;</td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5">{tmpl_var name='paging'}</td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/cron_edit.htm b/interface/web/themes/default-v2/templates/sites/cron_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7d47b4e277f2269315896f2a587a01625ecb7411
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/cron_edit.htm
@@ -0,0 +1,68 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_cron">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Cron Job</legend>
+            <div class="ctrlHolder">
+                <tmpl_if name="edit_disabled">
+                    <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                    <select name="parent_domain_id" id="parent_domain_id" class="selectInput" disabled="disabled">
+                        {tmpl_var name='parent_domain_id'}
+                    </select>
+                    <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+                    <tmpl_else>
+                        <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                            {tmpl_var name='parent_domain_id'}
+                        </select>
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="run_min">{tmpl_var name='run_min_txt'}</label>
+                <input name="run_min" id="run_min" value="{tmpl_var name='run_min'}" size="10" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. *, */3, 10-20</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="run_hour">{tmpl_var name='run_hour_txt'}</label>
+                <input name="run_hour" id="run_hour" value="{tmpl_var name='run_hour'}" size="10" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. *, */2, 0, 10-12</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="run_mday">{tmpl_var name='run_mday_txt'}</label>
+                <input name="run_mday" id="run_mday" value="{tmpl_var name='run_mday'}" size="10" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. *, */4, 1-5</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="run_month">{tmpl_var name='run_month_txt'}</label>
+                <input name="run_month" id="run_month" value="{tmpl_var name='run_month'}" size="10" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. *, 1-6</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="run_wday">{tmpl_var name='run_wday_txt'}</label>
+                <input name="run_wday" id="run_wday" value="{tmpl_var name='run_wday'}" size="10" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. *, 0, 1-5</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="command">{tmpl_var name='command_txt'}</label>
+                <input name="command" id="command" value="{tmpl_var name='command'}" size="30" maxlength="255" type="text" class="textInput" />
+                <p class="formHint">e.g. /var/www/clients/client1/myscript.sh or http://www.mydomain.com/path/script.php</p>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/cron_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/cron_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/cron_list.htm b/interface/web/themes/default-v2/templates/sites/cron_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f822b89ebeb14497d458d2972474e80060125df2
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/cron_list.htm
@@ -0,0 +1,74 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_cron">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/cron_edit.php');">
+                    <span>{tmpl_var name="add_new_cron_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_run_min" scope="col"><tmpl_var name="run_min_txt"></th>
+                        <th class="tbl_col_run_hour" scope="col"><tmpl_var name="run_hour_txt"></th>
+                        <th class="tbl_col_run_mday" scope="col"><tmpl_var name="run_mday_txt"></th>
+                        <th class="tbl_col_run_month" scope="col"><tmpl_var name="run_month_txt"></th>
+                        <th class="tbl_col_run_wday" scope="col"><tmpl_var name="run_wday_txt"></th>
+                        <th class="tbl_col_command" scope="col"><tmpl_var name="command_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_run_min"><input type="text" name="search_run_min" size="1" value="{tmpl_var name='search_run_min'}" /></td>
+                        <td class="tbl_col_run_hour"><input type="text" name="search_run_hour" size="1" value="{tmpl_var name='search_run_hour'}" /></td>
+                        <td class="tbl_col_run_mday"><input type="text" name="search_run_mday" size="1" value="{tmpl_var name='search_run_mday'}" /></td>
+                        <td class="tbl_col_run_month"><input type="text" name="search_run_month" size="1" value="{tmpl_var name='search_run_month'}" /></td>
+                        <td class="tbl_col_run_wday"><input type="text" name="search_run_wday" size="1" value="{tmpl_var name='search_run_wday'}" /></td>
+                        <td class="tbl_col_command"><input type="text" name="search_command" value="{tmpl_var name='search_command'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/cron_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_run_min"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_min"}</a></td>
+                            <td class="tbl_col_run_hour"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_hour"}</a></td>
+                            <td class="tbl_col_run_mday"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_mday"}</a></td>
+                            <td class="tbl_col_run_month"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_month"}</a></td>
+                            <td class="tbl_col_run_wday"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_wday"}</a></td>
+                            <td class="tbl_col_commnd"><a href="#" onClick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="command"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/cron_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="10"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/database_admin_list.htm b/interface/web/themes/default-v2/templates/sites/database_admin_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b6c90b5652abd799b0230ceced250228271716e2
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/database_admin_list.htm
@@ -0,0 +1,68 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_database_admin">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
+                        <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
+                        <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
+                        <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}" /></td>
+                        <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_remote_access"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="remote_access"}</a></td>
+                            <td class="tbl_col_sys_groupid"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></td>
+                            <td class="tbl_col_database_name"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">
+                                    <tmpl_if name="dblist_phpmyadmin_link">
+                                        <a class="icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
+                                    </tmpl_if>
+                                    <a class="icons16 icoEdit" href="javascript: loadContent('sites/database_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/database_edit.htm b/interface/web/themes/default-v2/templates/sites/database_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ada2f9482b48c93182dbdb53c38a39d0c4506ed3
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/database_edit.htm
@@ -0,0 +1,121 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_database">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                    {tmpl_var name='parent_domain_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="type">{tmpl_var name='type_txt'}</label>
+                <select name="type" id="type" class="selectInput formLengthHalf">
+                    {tmpl_var name='type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="database_name">{tmpl_var name='database_name_txt'}</label>
+                <p class="prefix">{tmpl_var name='database_name_prefix'}</p>
+                <tmpl_if name="edit_disabled">
+                    <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" disabled="disabled" />
+                    <input name="database_name" type="hidden" value="{tmpl_var name='database_name'}" />
+                    <tmpl_else>
+                        <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="database_user">{tmpl_var name='database_user_txt'}</label>
+                <p class="prefix">{tmpl_var name='database_user_prefix'}</p>
+                <input name="database_user" id="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="database_password">{tmpl_var name='database_password_txt'}</label>
+                <input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="password" class="textInput formLengthHalf" onkeyup="pass_check(this.value);checkPassMatch('database_password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('database_password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('database_password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <tmpl_if name="edit_disabled">
+                    <label for="database_charset_disabled">{tmpl_var name='database_charset_txt'}</label>
+                    <select name="database_charset_disabled" id="database_charset_disabled" class="selectInput formLengthHalf" disabled="disabled">
+                        {tmpl_var name='database_charset'}
+                    </select>
+                    <input type="hidden" name="database_charset" value="{tmpl_var name='database_charset_value'}" />
+                    <tmpl_else>
+                        <label for="database_charset">{tmpl_var name='database_charset_txt'}</label>
+                        <select name="database_charset" id="database_charset" class="selectInput formLengthHalf">
+                            {tmpl_var name='database_charset'}
+                        </select>
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='remote_access_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='remote_access'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="remote_ips">{tmpl_var name='remote_ips_txt'}</label>
+                <input name="remote_ips" id="remote_ips" value="{tmpl_var name='remote_ips'}" size="60" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/database_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/database_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#remote_ips').ispconfigSearch({
+        dataSrc: '/sites/ajax_get_json.php?type=get_ipv4',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/database_list.htm b/interface/web/themes/default-v2/templates/sites/database_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..d3b9ac5f90f8e6b5dcae385def69f8c5a4dcc44d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/database_list.htm
@@ -0,0 +1,66 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_database">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/database_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_user_txt"></th>
+                        <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td>
+                        <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_remote_access"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="remote_access"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_database_user"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></td>
+                            <td class="tbl_col_database_name"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <tmpl_if name="dblist_phpmyadmin_link">
+                                        <a class="icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
+                                    </tmpl_if>
+                                    <a class="icons16 icoEdit" href="javascript: loadContent('sites/database_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_advanced.htm b/interface/web/themes/default-v2/templates/sites/ftp_user_advanced.htm
new file mode 100644
index 0000000000000000000000000000000000000000..175b5fe5d9ee460adcf62825fcec162e45c3f1c7
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/ftp_user_advanced.htm
@@ -0,0 +1,50 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_ftp_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="uid">{tmpl_var name='uid_txt'}</label>
+                <input name="uid" id="uid" value="{tmpl_var name='uid'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="gid">{tmpl_var name='gid_txt'}</label>
+                <input name="gid" id="gid" value="{tmpl_var name='gid'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dir">{tmpl_var name='dir_txt'}</label>
+                <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="quota_files">{tmpl_var name='quota_files_txt'}</label>
+                <input name="quota_files" id="quota_files" value="{tmpl_var name='quota_files'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">{tmpl_var name='quota_files_unity_txt'}</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ul_ratio">{tmpl_var name='ul_ratio_txt'}</label>
+                <input name="ul_ratio" id="ul_ratio" value="{tmpl_var name='ul_ratio'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="dl_ratio">{tmpl_var name='dl_ratio_txt'}</label>
+                <input name="dl_ratio" id="dl_ratio" value="{tmpl_var name='dl_ratio'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ul_bandwidth">{tmpl_var name='ul_bandwidth_txt'}</label>
+                <input name="ul_bandwidth" id="ul_bandwidth" value="{tmpl_var name='ul_bandwidth'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">kb/s</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="dl_bandwidth">{tmpl_var name='dl_bandwidth_txt'}</label>
+                <input name="dl_bandwidth" id="dl_bandwidth" value="{tmpl_var name='dl_bandwidth'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">kb/s</p>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_advanced_client.htm b/interface/web/themes/default-v2/templates/sites/ftp_user_advanced_client.htm
new file mode 100644
index 0000000000000000000000000000000000000000..5918c6d571cc568d04d89d4857fd51b3acc3c82c
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/ftp_user_advanced_client.htm
@@ -0,0 +1,22 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_ftp_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="dir">{tmpl_var name='dir_txt'}</label>
+                <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm b/interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..25ea62953f80c88ec11f73a8d7e776f4fb62c81d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/ftp_user_edit.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_ftp_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                    {tmpl_var name='parent_domain_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <p class="prefix">{tmpl_var name='username_prefix'}</p>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="quota_size">{tmpl_var name='quota_size_txt'}</label>
+                <input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/ftp_user_list.htm b/interface/web/themes/default-v2/templates/sites/ftp_user_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..d455e0d4cdd0d266d52cf56e802c3e8447ab72c6
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/ftp_user_list.htm
@@ -0,0 +1,62 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_ftp_user">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/ftp_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/ftp_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <tmpl_if name="webftp_link">
+                                        <a class="icons16 icoDbAdmin" href="{tmpl_var name='webftp_url'}" target="_blank"><span>{tmpl_var name='admin_txt'}</span></a>
+                                    </tmpl_if>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/ftp_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/shell_user_advanced.htm b/interface/web/themes/default-v2/templates/sites/shell_user_advanced.htm
new file mode 100644
index 0000000000000000000000000000000000000000..bad78c81c641d7d05704dc5c6c63df6736809bad
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/shell_user_advanced.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_shell_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="puser">{tmpl_var name='puser_txt'}</label>
+                <input name="puser" id="puser" value="{tmpl_var name='puser'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="pgroup">{tmpl_var name='pgroup_txt'}</label>
+                <input name="pgroup" id="pgroup" value="{tmpl_var name='pgroup'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="shell">{tmpl_var name='shell_txt'}</label>
+                <input name="shell" id="shell" value="{tmpl_var name='shell'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dir">{tmpl_var name='dir_txt'}</label>
+                <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/shell_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/shell_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/shell_user_edit.htm b/interface/web/themes/default-v2/templates/sites/shell_user_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..554dbb99338d11bc3e92afb27efd74efdda8315e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/shell_user_edit.htm
@@ -0,0 +1,72 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_shell_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <tmpl_if name="edit_disabled">
+                    <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                    <select name="parent_domain_id" id="parent_domain_id" class="selectInput" disabled="disabled">
+                        {tmpl_var name='parent_domain_id'}
+                    </select>
+                    <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+                <tmpl_else>
+                        <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                            {tmpl_var name='parent_domain_id'}
+                        </select>
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <p class="prefix">{tmpl_var name='username_prefix'} </p>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput formLengthFourth"/>
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="chroot">{tmpl_var name='chroot_txt'}</label>
+                <select name="chroot" id="chroot" class="selectInput formLengthHalf">
+                    {tmpl_var name='chroot'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="quota_size">{tmpl_var name='quota_size_txt'}</label>
+                <input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssh_rsa">{tmpl_var name='ssh_rsa_txt'}</label>
+                <textarea name="ssh_rsa" id="ssh_rsa" rows="10" cols="30">{tmpl_var name='ssh_rsa'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/shell_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/shell_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/shell_user_list.htm b/interface/web/themes/default-v2/templates/sites/shell_user_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..9087c6669afccbc04fc53419ab1e5ea9f1b26025
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/shell_user_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_shell_user">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/shell_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/shell_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/shell_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/user_quota_stats_list.htm b/interface/web/themes/default-v2/templates/sites/user_quota_stats_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..adb1e356143b61522a97cd11b7c96ef515ecb419
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/user_quota_stats_list.htm
@@ -0,0 +1,54 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_user_quota_stats">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                    <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                    <th class="tbl_col_system_user" scope="col"><tmpl_var name="system_user_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="soft_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="hard_txt"></th>
+                    <th class="" scope="col" style="text-align:right;"><tmpl_var name="files_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                    <td class="tbl_col_system_user"><input type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_system_user">&nbsp;</td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_system_user"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="system_user"}</a></td>
+                            <td class="tbl_col_used" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
+                            <td class="tbl_col_soft" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="soft"}</a></td>
+                            <td class="tbl_col_hard" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hard"}</a></td>
+                            <td class="tbl_col_files" style="text-align:right;"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="files"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    &nbsp;
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_aliasdomain_edit.htm b/interface/web/themes/default-v2/templates/sites/web_aliasdomain_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0ccaa5edf1e0a8006efb538404f69437dd464232
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_aliasdomain_edit.htm
@@ -0,0 +1,125 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <tmpl_if name="domain_option">
+                    <select name="domain" id="domain" class="selectInput">
+                        {tmpl_var name='domain_option'}
+                    </select>
+                    <tmpl_else>
+                        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                    {tmpl_var name='parent_domain_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
+                <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
+                    {tmpl_var name='redirect_type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
+                <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
+                <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+                    {tmpl_var name='subdomain'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    var webId = jQuery('#parent_domain_id').val();
+    var serverId;
+    getServerId(webId);
+		
+    jQuery('#parent_domain_id').change(function(){
+        webId = $(this).val();
+        getServerId(webId);
+    });
+		
+    function getServerId(webId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
+            serverId = data.serverid;
+            adjustForm(serverId);
+        });
+    }
+		
+    function adjustForm(serverId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+            var selected = jQuery('#redirect_type').val();
+            if(data.servertype == "nginx"){
+                jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
+                jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
+					
+                jQuery("#redirect_type option[value='R']").hide();
+                jQuery('#redirect_type option[value="L"]').hide();
+                jQuery('#redirect_type option[value="R,L"]').hide();
+                jQuery('#redirect_type option[value="R=301,L"]').hide();
+					
+                jQuery('#redirect_type option[value="last"]').show();
+                jQuery('#redirect_type option[value="break"]').show();
+                jQuery('#redirect_type option[value="redirect"]').show();
+                jQuery('#redirect_type option[value="permanent"]').show();
+					
+                jQuery('#redirect_type option[value="last"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="break"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
+					
+                if(selected != "no" && selected != "" && selected != "last"  && selected != "break"  && selected != "redirect"  && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            } else {
+                jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+					
+                jQuery('#redirect_type option[value="last"]').hide();
+                jQuery('#redirect_type option[value="break"]').hide();
+                jQuery('#redirect_type option[value="redirect"]').hide();
+                jQuery('#redirect_type option[value="permanent"]').hide();
+					
+                jQuery('#redirect_type option[value="R"]').show();
+                jQuery('#redirect_type option[value="L"]').show();
+                jQuery('#redirect_type option[value="R,L"]').show();
+                jQuery('#redirect_type option[value="R=301,L"]').show();
+					
+                jQuery('#redirect_type option[value="R"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="L"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
+					
+                if(selected != "no" && selected != "" && selected != "R"  && selected != "L"  && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            }
+        });
+    }
+			
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_aliasdomain_list.htm b/interface/web/themes/default-v2/templates/sites/web_aliasdomain_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..faab74e1919b48a1798761f81bb6419b62ba3b63
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_aliasdomain_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_aliasdomain">
+
+    <div class="pnl_listsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_aliasdomain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/web_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_backup_list.htm b/interface/web/themes/default-v2/templates/sites/web_backup_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..85639770961b52ab02e7a4f3f2fc8c696f4e6b34
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_backup_list.htm
@@ -0,0 +1,41 @@
+<tmpl_if name="msg">
+    <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+</tmpl_if>
+<tmpl_if name="error">
+    <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+</tmpl_if>
+<h3><tmpl_var name="list_head_txt"></h3>
+
+<div class="panel panel_list_web_backup">
+    
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>
+                        <th class="tbl_col_date" scope="col"><tmpl_var name="backup_type_txt"></th>
+                        <th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>
+                        <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_date">{tmpl_var name="date"}</td>
+                            <td class="tbl_col_date">{tmpl_var name="backup_type"}</td>
+                            <td class="tbl_col_filename">{tmpl_var name="filename"}</td>
+                            <td class="tbl_col_buttons" style="width:300px;">
+                                <div class="buttons" >
+                                    <button class="iconstxt icoRestore" type="button" onClick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>
+                                    <button class="iconstxt icoDownload" type="button" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}');"><span>{tmpl_var name="download_backup_txt"}</span></button>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_admin_list.htm b/interface/web/themes/default-v2/templates/sites/web_domain_admin_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f363e44c70cfd8bcbb31a08ee1d1a1efec5b478e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_admin_list.htm
@@ -0,0 +1,61 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_web_domain_admin">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_domain_id"><input type="text" name="search_domain_id" size="4" value="{tmpl_var name='search_domain_id'}" /></td>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_domain_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain_id"}</a></td>
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_sys_groupid"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_advanced.htm b/interface/web/themes/default-v2/templates/sites/web_domain_advanced.htm
new file mode 100644
index 0000000000000000000000000000000000000000..87107400af24704f79644aa7ac3cc83dac2373cf
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_advanced.htm
@@ -0,0 +1,146 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <input name="document_root" id="document_root" value="{tmpl_var name='document_root'}" size="30" maxlength="255" type="hidden" class="textInput" />
+            <div class="ctrlHolder">
+                <label for="system_user">{tmpl_var name='system_user_txt'}</label>
+                <label for="system_user">{tmpl_var name='system_user'}</label>
+                <input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" type="hidden" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="system_group">{tmpl_var name='system_group_txt'}</label>
+                <label for="system_group">{tmpl_var name='system_group'}</label>
+                <input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="allow_override">{tmpl_var name='allow_override_txt'}</label>
+                <input name="allow_override" id="allow_override" value="{tmpl_var name='allow_override'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="phpfpm">
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name='php_fpm_use_socket_txt'}</p>
+                    <div class="multiField">
+                        {tmpl_var name='php_fpm_use_socket'}
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="pm">{tmpl_var name='pm_txt'}</label>
+                    <select name="pm" id="pm" class="selectInput">
+                        {tmpl_var name='pm'}
+                    </select>
+                </div>
+                <div class="ctrlHolder pm_ondemand" style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
+                    {tmpl_var name='pm_ondemand_hint_txt'}
+                </div>
+                <div class="ctrlHolder">
+                    <label for="pm_max_children">{tmpl_var name='pm_max_children_txt'}</label>
+                    <input name="pm_max_children" id="pm_max_children" value="{tmpl_var name='pm_max_children'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder pm_dynamic">
+                    <label for="pm_start_servers">{tmpl_var name='pm_start_servers_txt'}</label>
+                    <input name="pm_start_servers" id="pm_start_servers" value="{tmpl_var name='pm_start_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder pm_dynamic">
+                    <label for="pm_min_spare_servers">{tmpl_var name='pm_min_spare_servers_txt'}</label>
+                    <input name="pm_min_spare_servers" id="pm_min_spare_servers" value="{tmpl_var name='pm_min_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder pm_dynamic">
+                    <label for="pm_max_spare_servers">{tmpl_var name='pm_max_spare_servers_txt'}</label>
+                    <input name="pm_max_spare_servers" id="pm_max_spare_servers" value="{tmpl_var name='pm_max_spare_servers'}" size="3" maxlength="3" type="text" class="textInput formLengthLimit" />
+                </div>
+                <div class="ctrlHolder pm_ondemand">
+                    <label for="pm_process_idle_timeout">{tmpl_var name='pm_process_idle_timeout_txt'}</label>
+                    <input name="pm_process_idle_timeout" id="pm_process_idle_timeout" value="{tmpl_var name='pm_process_idle_timeout'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" />&nbsp;s
+                </div>
+                <div class="ctrlHolder">
+                    <label for="pm_max_requests">{tmpl_var name='pm_max_requests_txt'}</label>
+                    <input name="pm_max_requests" id="pm_max_requests" value="{tmpl_var name='pm_max_requests'}" size="3" maxlength="6" type="text" class="textInput formLengthLimit" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
+                <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="30" type="text" class="textInput"  style="width:400px;" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="custom_php_ini">{tmpl_var name='custom_php_ini_txt'}</label>
+                <textarea name="custom_php_ini" id="custom_php_ini" rows='10' cols='50' style="width:400px;">{tmpl_var name='custom_php_ini'}</textarea>
+            </div>
+            <div class="ctrlHolder apache">
+                <label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
+                <textarea name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea>
+            </div>
+            <div class="ctrlHolder nginx">
+                <label for="nginx_directives">{tmpl_var name='nginx_directives_txt'}</label>
+                <textarea name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    var webId = jQuery('input[name="id"]').val();
+    var serverId;
+    getServerId();
+    adjustForm();
+		
+    var pm = jQuery('#pm').val();
+    pmMode(pm);
+    jQuery('#pm').change(function(){
+        pm = jQuery(this).val();
+        pmMode(pm);
+    });
+		
+    function pmMode(pm){
+        switch(pm){
+            case "static":
+                jQuery('.pm_dynamic').add('.pm_ondemand').hide();
+                jQuery('.pm_static').show();
+                break;
+            case "dynamic":
+                jQuery('.pm_static').add('.pm_ondemand').hide();
+                jQuery('.pm_dynamic').show();
+                break;
+            case "ondemand":
+                jQuery('.pm_static').add('.pm_dynamic').hide();
+                jQuery('.pm_ondemand').show();
+                break;
+        }
+    }
+		
+    function getServerId(){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
+            serverId = data.serverid;
+        });
+    }
+		
+    function adjustForm(){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+            if(data.servertype == "nginx"){
+                jQuery('.nginx').show();
+                jQuery('.apache').hide();
+            } else {
+                jQuery('.nginx').hide();
+                jQuery('.apache').show();
+            }
+        });
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getphptype"}, function(data) {
+            if(data.phptype == "php-fpm"){
+                jQuery('.phpfpm').show();
+            } else {
+                jQuery('.phpfpm').hide();
+            }
+        });
+    }
+			
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_backup.htm b/interface/web/themes/default-v2/templates/sites/web_domain_backup.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c46d4e2d4ef9a3fd0aae5921d68d194f959bfb86
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_backup.htm
@@ -0,0 +1,32 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Backup</legend>
+            <div class="ctrlHolder">
+                <label for="backup_interval">{tmpl_var name='backup_interval_txt'}</label>
+                <select name="backup_interval" id="backup_interval" class="selectInput">
+                    {tmpl_var name='backup_interval'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="backup_copies">{tmpl_var name='backup_copies_txt'}</label>
+                <select name="backup_copies" id="backup_copies" class="selectInput">
+                    {tmpl_var name='backup_copies'}
+                </select>
+            </div>
+        </fieldset>
+
+        {tmpl_var name='backup_records'}
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm b/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..496ddec53248212edf019ce889671d161db41385
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_edit.htm
@@ -0,0 +1,227 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                        <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+                <tmpl_else>
+                    <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
+            </tmpl_if>
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+                <select name="ip_address" id="ip_address" class="selectInput formLengthIPv4">
+                    {tmpl_var name='ip_address'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ipv6_address">{tmpl_var name='ipv6_address_txt'}</label>
+                <select name="ipv6_address" id="ipv6_address" class="selectInput formLengthIPv4">
+                    {tmpl_var name='ipv6_address'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='domain_txt'}</label>
+                <tmpl_if name="domain_option">
+                    <select name="domain" id="domain" class="selectInput">
+                        {tmpl_var name='domain_option'}
+                    </select>
+                    <tmpl_else>
+                        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="hd_quota">{tmpl_var name='hd_quota_txt'}</label>
+                <input name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />&nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
+                <input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />&nbsp;MB <tmpl_var name='traffic_quota_exceeded_txt'>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='cgi_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='cgi'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ssi_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ssi'}
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <p class="label">{tmpl_var name='ruby_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ruby'}
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <p class="label">{tmpl_var name='python_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='python'}
+                </div>
+            </div>
+            <div class="ctrlHolder apache">
+                <p class="label">{tmpl_var name='suexec_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='suexec'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='errordocs_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='errordocs'}
+                </div>
+            </div>
+
+            <div class="ctrlHolder">
+                <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
+                <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+                    {tmpl_var name='subdomain'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ssl_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='ssl'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="php">{tmpl_var name='php_txt'}</label>
+                <select name="php" id="php" class="selectInput formLengthHalf">
+                    {tmpl_var name='php'}
+                </select>
+            </div>
+            <div class="ctrlHolder fastcgi_php_version">
+                <label for="fastcgi_php_version">{tmpl_var name='fastcgi_php_version_txt'}</label>
+                <select name="fastcgi_php_version" id="fastcgi_php_version" class="selectInput formLengthHalf">
+                    {tmpl_var name='fastcgi_php_version'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    var serverId;
+    var clientGroupId = jQuery('#client_group_id').val();
+    var serverIdDisabled = jQuery('#server_id_disabled').val();
+    if(serverIdDisabled > 0){
+        serverId = serverIdDisabled;
+    } else {
+        serverId = jQuery('#server_id').val();
+        jQuery('#server_id').change(function(){
+            serverId = $(this).val();
+            adjustForm();
+            reloadWebIP();
+            reloadFastcgiPHPVersions();
+        });
+    }
+    adjustForm();
+		
+    jQuery('#client_group_id').change(function(){
+        clientGroupId = $(this).val();
+        reloadWebIP();
+    });
+		
+    if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm'){
+        jQuery('.fastcgi_php_version:hidden').show();
+    } else {
+        jQuery('.fastcgi_php_version:visible').hide();
+    }
+    jQuery('#php').change(function(){
+        reloadFastcgiPHPVersions();
+        if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm'){
+            jQuery('.fastcgi_php_version:hidden').show();
+        } else {
+            jQuery('.fastcgi_php_version:visible').hide();
+        }
+    });
+		
+    function adjustForm(){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+            if(data.servertype == "nginx"){
+                var selected = jQuery('#php').val();
+                jQuery('.apache').hide();
+                jQuery('.apache').hide();
+                jQuery('#php option[value="fast-cgi"]').hide();
+                jQuery('#php option[value="cgi"]').hide();
+                jQuery('#php option[value="mod"]').hide();
+                jQuery('#php option[value="suphp"]').hide();
+                if(selected != "no" && selected != "php-fpm") jQuery('#php option[value="php-fpm"]').attr('selected', 'selected');
+            } else {
+                jQuery('.apache').show();
+                jQuery('.apache').show();
+                jQuery('#php option[value="fast-cgi"]').show();
+                jQuery('#php option[value="cgi"]').show();
+                jQuery('#php option[value="mod"]').show();
+                jQuery('#php option[value="suphp"]').show();
+            }
+        });
+    }
+		
+    function reloadWebIP() {
+        loadOptionInto('ip_address','sites/ajax_get_ip.php?ip_type=IPv4&server_id='+serverId+'&client_group_id='+clientGroupId);
+        loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
+    }
+		
+    function reloadFastcgiPHPVersions() {
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi"}, function(data) {
+            var options = '<option value="">Default</option>';
+            var phpfastcgiselected = '';
+            $.each(data, function(key, val) {
+                if($('#fastcgi_php_version').val() == key){
+                    phpfastcgiselected = ' selected="selected"';
+                } else {
+                    phpfastcgiselected = '';
+                }
+                options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
+            });
+            $('#fastcgi_php_version').html(options);
+        });
+    }
+			
+</script>
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_list.htm b/interface/web/themes/default-v2/templates/sites/web_domain_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..4ce5d5ddd43c7891e7bc3df8fce6e612ced757a7
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_domain">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_domain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                <tr>
+                    <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
+                    <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                    <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                    <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                    <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                </tr>
+                <tr>
+                    <td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td>
+                    <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                    <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                    <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                    <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_domain_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain_id"}</a></td>
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_redirect.htm b/interface/web/themes/default-v2/templates/sites/web_domain_redirect.htm
new file mode 100644
index 0000000000000000000000000000000000000000..66a17034c9b27fec864671d69ddddf1024273511
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_redirect.htm
@@ -0,0 +1,76 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
+                <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
+                    {tmpl_var name='redirect_type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
+                <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
+                <select name="seo_redirect" id="seo_redirect" class="selectInput formLengthHalf">
+                    {tmpl_var name='seo_redirect'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+    var webId = jQuery('input[name="id"]').val();
+    var serverId;
+    getServerId(webId);
+		
+    function getServerId(webId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
+            serverId = data.serverid;
+            adjustForm(serverId);
+        });
+    }
+		
+    function adjustForm(serverId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+            var selected = jQuery('#redirect_type').val();
+            if(data.servertype == "nginx"){
+                jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
+                jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
+
+                jQuery('#redirect_type option[value="R"]').hide();
+                jQuery('#redirect_type option[value="L"]').hide();
+                jQuery('#redirect_type option[value="R,L"]').hide();
+                jQuery('#redirect_type option[value="R=301,L"]').hide();
+                if(selected != "no" && selected != "" && selected != "last"  && selected != "break"  && selected != "redirect"  && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            } else {
+                jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+					
+                jQuery('#redirect_type option[value="last"]').hide();
+                jQuery('#redirect_type option[value="break"]').hide();
+                jQuery('#redirect_type option[value="redirect"]').hide();
+                jQuery('#redirect_type option[value="permanent"]').hide();
+                if(selected != "no" && selected != "" && selected != "R"  && selected != "L"  && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            }
+        });
+    }
+			
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm b/interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0b1d1fee18a0323a3123c601e2e3869ccb18a280
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_ssl.htm
@@ -0,0 +1,64 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="ssl_state">{tmpl_var name='ssl_state_txt'}</label>
+                <input name="ssl_state" id="ssl_state" value="{tmpl_var name='ssl_state'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_locality">{tmpl_var name='ssl_locality_txt'}</label>
+                <input name="ssl_locality" id="ssl_locality" value="{tmpl_var name='ssl_locality'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_organisation">{tmpl_var name='ssl_organisation_txt'}</label>
+                <input name="ssl_organisation" id="ssl_organisation" value="{tmpl_var name='ssl_organisation'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_organisation_unit">{tmpl_var name='ssl_organisation_unit_txt'}</label>
+                <input name="ssl_organisation_unit" id="ssl_organisation_unit" value="{tmpl_var name='ssl_organisation_unit'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_country">{tmpl_var name='ssl_country_txt'}</label>
+                <select name="ssl_country" id="ssl_country" class="selectInput flags">
+                    {tmpl_var name='ssl_country'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="client_group_id">{tmpl_var name='ssl_domain_txt'}</label>
+                <select name="ssl_domain" id="ssl_domain" class="selectInput">
+                    {tmpl_var name='ssl_domain'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_request">{tmpl_var name='ssl_request_txt'}</label>
+                <textarea name="ssl_request" id="ssl_request" rows='10' cols='30'>{tmpl_var name='ssl_request'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_cert">{tmpl_var name='ssl_cert_txt'}</label>
+                <textarea name="ssl_cert" id="ssl_cert" rows='10' cols='30'>{tmpl_var name='ssl_cert'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_bundle">{tmpl_var name='ssl_bundle_txt'}</label>
+                <textarea name="ssl_bundle" id="ssl_bundle" rows='10' cols='30'>{tmpl_var name='ssl_bundle'}</textarea>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ssl_action">{tmpl_var name='ssl_action_txt'}</label>
+                <select name="ssl_action" id="ssl_action" class="selectInput formLengthHalf">
+                    {tmpl_var name='ssl_action'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_domain_stats.htm b/interface/web/themes/default-v2/templates/sites/web_domain_stats.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b5ffe73848220522c19e9ae9c055af4902e07f2b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_domain_stats.htm
@@ -0,0 +1,37 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='stats_user_txt'}</p><p class="value">admin</p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="stats_password">{tmpl_var name='stats_password_txt'}</label>
+                <input name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('stats_password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('stats_password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="stats_type">{tmpl_var name='stats_type_txt'}</label>
+                <select name="stats_type" id="stats_type" class="selectInput" >
+                    {tmpl_var name='stats_type'}
+                </select>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_edit.htm b/interface/web/themes/default-v2/templates/sites/web_folder_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..4165ab70b1688db02b541fd46ac0ad8c8e2e7253
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_folder_edit.htm
@@ -0,0 +1,34 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_folder">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Folder</legend>
+            <div class="ctrlHolder">
+                <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                    {tmpl_var name='parent_domain_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="path">{tmpl_var name='path_txt'}</label>
+                <input name="path" id="path" value="{tmpl_var name='path'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_folder_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_folder_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_list.htm b/interface/web/themes/default-v2/templates/sites/web_folder_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..3dcb9ee0cbb2c415165ef1cbb2eb789eed3aa305
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_folder_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_web_folder">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_path" scope="col"><tmpl_var name="path_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_path"><input type="text" name="search_path" value="{tmpl_var name='search_path'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                        <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                        <td class="tbl_col_path"><a href="#" onClick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="path"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_folder_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm b/interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..1e9cae1a0b696e63edd60f7a7023e7b2a9dea746
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_folder_user_edit.htm
@@ -0,0 +1,49 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_folder_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Folder</legend>
+            <div class="ctrlHolder">
+                <label for="web_folder_id">{tmpl_var name='web_folder_id_txt'}</label>
+                <select name="web_folder_id" id="web_folder_id" class="selectInput">
+                    {tmpl_var name='web_folder_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_folder_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_folder_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
diff --git a/interface/web/themes/default-v2/templates/sites/web_folder_user_list.htm b/interface/web/themes/default-v2/templates/sites/web_folder_user_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2df924f1c9993b148606ecb69a8d0615752eb3c0
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_folder_user_list.htm
@@ -0,0 +1,55 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_web_folder_user">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_folder_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_web_folder_id" scope="col"><tmpl_var name="web_folder_id_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_web_folder_id"><select name="search_web_folder_id" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_web_folder_id'}</select></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_folder_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                        <td class="tbl_col_web_folder_id"><a href="#" onClick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="web_folder_id"}</a></td>
+                        <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                                <a class="icons16 icoDelete" href="javascript: del_record('sites/web_folder_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm b/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..a0814ad23ad33fcbddd05e0c9a5b6b9028178c65
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_sites_stats_list.htm
@@ -0,0 +1,51 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_sites_stats">
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_web_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
+                        <th class="tbl_col_web_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
+                        <th class="tbl_col_web_traffic_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
+                        <th class="tbl_col_web_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_this_month"></td>
+                        <td class="tbl_col_last_month"></td>
+                        <td class="tbl_col_this_year"></td>
+                        <td class="tbl_col_last_year"></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_sites_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                <tmpl_loop name="records">
+                    <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                        <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                        <td class="tbl_col_this_month"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_month"} MB</a></td>
+                        <td class="tbl_col_last_month"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_month"} MB</a></td>
+                        <td class="tbl_col_this_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_year"} MB</a></td>
+                        <td class="tbl_col_last_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_year"} MB</a></td>
+                        <td class="tbl_col_buttons">
+                            <div class="buttons icons16">    
+                            </div>
+                        </td>
+                    </tr>
+                </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_subdomain_edit.htm b/interface/web/themes/default-v2/templates/sites/web_subdomain_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..a8b0fe9bd0ea7f871da26364c1c4bf3769d9eaba
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_subdomain_edit.htm
@@ -0,0 +1,112 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_subdomain">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="domain">{tmpl_var name='host_txt'}</label>
+                <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="parent_domain_id">{tmpl_var name='domain_txt'}</label>
+                <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
+                <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
+                    {tmpl_var name='redirect_type'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
+                <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_subdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_subdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    //var webId = jQuery('input[name="id"]').val();
+    var webId = jQuery('#parent_domain_id').val();
+    var serverId;
+    getServerId(webId);
+    
+    jQuery('#parent_domain_id').change(function(){
+        webId = $(this).val();
+        getServerId(webId);
+    });
+    
+    function getServerId(webId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
+            serverId = data.serverid;
+            adjustForm(serverId);
+        });
+    }
+    
+    function adjustForm(serverId){
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+            var selected = jQuery('#redirect_type').val();
+            if(data.servertype == "nginx"){
+                jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
+                jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
+                
+                jQuery("#redirect_type option[value='R']").hide();
+                jQuery('#redirect_type option[value="L"]').hide();
+                jQuery('#redirect_type option[value="R,L"]').hide();
+                jQuery('#redirect_type option[value="R=301,L"]').hide();
+                
+                jQuery('#redirect_type option[value="last"]').show();
+                jQuery('#redirect_type option[value="break"]').show();
+                jQuery('#redirect_type option[value="redirect"]').show();
+                jQuery('#redirect_type option[value="permanent"]').show();
+                
+                jQuery('#redirect_type option[value="last"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="break"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
+                
+                if(selected != "no" && selected != "" && selected != "last"  && selected != "break"  && selected != "redirect"  && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            } else {
+                jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
+                jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+                
+                jQuery('#redirect_type option[value="last"]').hide();
+                jQuery('#redirect_type option[value="break"]').hide();
+                jQuery('#redirect_type option[value="redirect"]').hide();
+                jQuery('#redirect_type option[value="permanent"]').hide();
+                
+                jQuery('#redirect_type option[value="R"]').show();
+                jQuery('#redirect_type option[value="L"]').show();
+                jQuery('#redirect_type option[value="R,L"]').show();
+                jQuery('#redirect_type option[value="R=301,L"]').show();
+                
+                jQuery('#redirect_type option[value="R"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="L"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
+                jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
+                
+                if(selected != "no" && selected != "" && selected != "R"  && selected != "L"  && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+            }
+        });
+    }
+    
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/web_subdomain_list.htm b/interface/web/themes/default-v2/templates/sites/web_subdomain_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..237cd8568970f9066346379b389250c9aa10ffc8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/web_subdomain_list.htm
@@ -0,0 +1,60 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_web_subdomain">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/web_subdomain_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_subdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_subdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/web_subdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+
+                <tfoot>
+                    <tr>
+                    <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm b/interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7a110c7468375e0cee007e2aa03ba924f2ad459d
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/webdav_user_edit.htm
@@ -0,0 +1,64 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_webdav_user">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <tmpl_if name="edit_disabled">
+                    <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                    <select name="parent_domain_id" id="parent_domain_id" class="selectInput" disabled="disabled">
+                        {tmpl_var name='parent_domain_id'}
+                    </select>
+                    <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+                    <tmpl_else>
+                        <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+                        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+                            {tmpl_var name='parent_domain_id'}
+                        </select>
+                </tmpl_if>
+            </div>
+            <div class="ctrlHolder">
+                <label for="username">{tmpl_var name='username_txt'}</label>
+                <p class="prefix">{tmpl_var name='username_prefix'}</p>
+                <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput formLengthFourth" <tmpl_if name="edit_disabled">disabled="disabled"</tmpl_if>/>
+            </div>
+            <div class="ctrlHolder">
+                <label for="password">{tmpl_var name='password_txt'}</label>
+                <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('password');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('password','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="dir">{tmpl_var name='dir_txt'}</label>
+                <p class="prefix">webdav/</p>
+                <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" <tmpl_if name="edit_disabled">disabled="disabled"</tmpl_if>/>
+            </div>
+
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/webdav_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/webdav_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/sites/webdav_user_list.htm b/interface/web/themes/default-v2/templates/sites/webdav_user_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ee2b45df80049d536cb6d0ac7bb5cc9ae284e892
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/sites/webdav_user_list.htm
@@ -0,0 +1,59 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_list_webdav_user">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('sites/webdav_user_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
+                        <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+                        <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/webdav_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_parent_domain_id"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
+                            <td class="tbl_col_username"><a href="#" onClick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('sites/webdav_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/tabbed_form.tpl.htm b/interface/web/themes/default-v2/templates/tabbed_form.tpl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2890e1b17af580cac175483bc62752a716ee6e71
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tabbed_form.tpl.htm
@@ -0,0 +1,27 @@
+<tmpl_if name="form_hint">
+    <h2><tmpl_var name="form_hint"></h2>
+</tmpl_if>
+<div class="tabbox_tabs">
+    <ul>
+        <tmpl_loop name="formTab">
+            <tmpl_if name="active">
+                <li class="active"><a href="javascript:changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a></li>
+            <tmpl_else>
+                <li><a href="javascript:changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a></li>
+            </tmpl_if>
+        </tmpl_loop>
+    </ul>
+</div>
+<div id="tabbox_content">
+    <tmpl_if name="msg">
+        <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+    </tmpl_if>
+    <tmpl_if name="error">
+        <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+    </tmpl_if>
+    
+    <tmpl_dyninclude name="content_tpl">
+</div>
+
+<input type="hidden" name="next_tab" value="">
+<input type="hidden" name="phpsessid" value="{tmpl_var name='phpsessid'}">
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/tools/dns_import_tupa.htm b/interface/web/themes/default-v2/templates/tools/dns_import_tupa.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b4fad7e6f2b1251d8290b8c12661d14368f48714
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tools/dns_import_tupa.htm
@@ -0,0 +1,56 @@
+<h2>Import DNS recods from Tupa PowerDNS controlpanel</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>PowerDNS Tupa import</legend>
+            <div class="ctrlHolder">
+                <p class="label">Tupa database hostname</p>
+                <div class="multiField">
+                    <input id="dbhost" type="text" value="{tmpl_var name='dbhost'}" name="dbhost" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Tupa database name</p>
+                <div class="multiField">
+                    <input id="dbname" type="text" value="{tmpl_var name='dbname'}" name="dbname" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Tupa database user</p>
+                <div class="multiField">
+                    <input id="dbuser" type="text" value="{tmpl_var name='dbuser'}" name="dbuser" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Tupa database password</p>
+                <div class="multiField">
+                    <input id="dbpassword" type="text" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
+                </div>
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">Import DNS Records</p>
+                <div class="multiField">
+                    <input id="start" type="checkbox" value="1" name="start" checked/>
+                </div>
+            </div>
+        </fieldset>
+
+        <tmpl_if name="msg">
+            <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+        </tmpl_if>
+        <tmpl_if name="error">
+            <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+        </tmpl_if>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/dns_import_tupa.php');"><span>Start</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>Cancel</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/tools/import_ispconfig.htm b/interface/web/themes/default-v2/templates/tools/import_ispconfig.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7d7b4c17bcad8e170b319b4ef3fcdc46df46e635
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tools/import_ispconfig.htm
@@ -0,0 +1,103 @@
+<h2>{tmpl_var name="head_txt"}</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name="legend_txt"}</legend>
+            <div class="ctrlHolder">
+                <p class="label">Remote API URL</p>
+                <div class="multiField">
+                    <input id="remote_server" type="text" value="{tmpl_var name='remote_server'}" name="remote_server" /> (e.g. https://www.example.com:8080/remote/ )
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Remote User</p>
+                <div class="multiField">
+                    <input id="remote_user" type="text" value="{tmpl_var name='remote_user'}" name="remote_user" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Remote password</p>
+                <div class="multiField">
+                    <input id="remote_password" type="text" value="{tmpl_var name='remote_password'}" name="remote_password" />
+                </div>
+            </div>
+        </fieldset>
+    </div>
+    <tmpl_if name="connected">
+        <div class="pnl_formsarea">
+            <fieldset class="inlineLabels"><legend>{tmpl_var name="legend2_txt"}</legend>
+                <div class="ctrlHolder">
+                    <label for="mail_domain">{tmpl_var name='mail_domain_txt'}</label>
+                    <select name="mail_domain" id="mail_domain" class="selectInput">
+                        {tmpl_var name='mail_domain'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_mailbox_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_mailbox" type="checkbox" value="1" name="import_mailbox" checked="checked" />
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_user_filter_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_user_filter" type="checkbox" value="1" name="import_user_filter" checked="checked" />
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_spamfilter_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_spamfilter" type="checkbox" value="1" name="import_spamfilter" checked="checked" />
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_alias_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_alias" type="checkbox" value="1" name="import_alias" checked="checked" />
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_forward_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_forward" type="checkbox" value="1" name="import_forward" checked="checked" />
+                    </div>
+                </div>
+                <div class="ctrlHolder">
+                    <p class="label">{tmpl_var name="import_aliasdomain_txt"}</p>
+                    <div class="multiField">
+                        <input id="import_aliasdomain" type="checkbox" value="1" name="import_aliasdomain" checked="checked" />
+                    </div>
+                </div>
+            </fieldset>
+        </div>
+    </tmpl_if>
+	 
+    <tmpl_if name="msg">
+        <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+    </tmpl_if>
+    <tmpl_if name="error">
+        <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+    </tmpl_if>
+	
+    <input type="hidden" name="remote_session_id" value="{tmpl_var name='remote_session_id'}">
+    <input type="hidden" name="connected" value="{tmpl_var name='connected'}">
+    <tmpl_if name="connected">
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+        </div>
+    <tmpl_else>
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_connect_txt"}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+        </div>
+    </tmpl_if>
+  </div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/tools/import_plesk.htm b/interface/web/themes/default-v2/templates/tools/import_plesk.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f72096c7003a5ee9bd32e728a1ef06626e128e89
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tools/import_plesk.htm
@@ -0,0 +1,74 @@
+<h2>Import plesk panel data</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Plesk data import</legend>
+            <div class="ctrlHolder">
+                <p class="label">Plesk database hostname</p>
+                <div class="multiField">
+                    <input id="dbhost" type="text" value="{tmpl_var name='dbhost'}" name="dbhost" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Plesk database name</p>
+                <div class="multiField">
+                    <input id="dbname" type="text" value="{tmpl_var name='dbname'}" name="dbname" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Plesk database user</p>
+                <div class="multiField">
+                    <input id="dbuser" type="text" value="{tmpl_var name='dbuser'}" name="dbuser" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Plesk database password</p>
+                <div class="multiField">
+                    <input id="dbpassword" type="text" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Web content backup file (on this server, optional)</p>
+                <div class="multiField">
+                    <input id="webcontent" type="text" value="{tmpl_var name='webcontent'}" name="webcontent" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Maildir content backup file (on this server, optional)</p>
+                <div class="multiField">
+                    <input id="mailcontent" type="text" value="{tmpl_var name='mailcontent'}" name="mailcontent" />
+                </div>
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">Import all data (that can be imported)</p>
+                <div class="multiField">
+                    <input id="start" type="checkbox" value="1" name="start" checked/>
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">Import database contents (make sure the database user has the rights to do so)</p>
+                <div class="multiField">
+                    <input id="dbdata" type="checkbox" value="1" name="dbdata" checked/>
+                </div>
+            </div>
+        </fieldset>
+
+        <tmpl_if name="msg">
+            <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+        </tmpl_if>
+        <tmpl_if name="error">
+            <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+        </tmpl_if>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_plesk.php');"><span>Start</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>Cancel</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/tools/resync.htm b/interface/web/themes/default-v2/templates/tools/resync.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c7611b804984aa544a75784e8e5fd2a890b99f07
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tools/resync.htm
@@ -0,0 +1,67 @@
+<h2>{tmpl_var name="head_txt"}</h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name="legend_txt"}</legend>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_sites_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_sites" type="checkbox" value="1" name="resync_sites" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_ftp_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_ftp" type="checkbox" value="1" name="resync_ftp" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_shell_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_shell" type="checkbox" value="1" name="resync_shell" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_cron_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_cron" type="checkbox" value="1" name="resync_cron" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_db_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_db" type="checkbox" value="1" name="resync_db" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_mailbox_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_mailbox" type="checkbox" value="1" name="resync_mailbox" />
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_dns_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_dns" type="checkbox" value="1" name="resync_dns" />
+                </div>
+            </div>
+        </fieldset>
+
+        <tmpl_if name="msg">
+            <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+        </tmpl_if>
+        <tmpl_if name="error">
+            <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+        </tmpl_if>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/resync.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+        </div>
+    </div>
+  
+</div>
diff --git a/interface/web/themes/default-v2/templates/tools/user_settings.htm b/interface/web/themes/default-v2/templates/tools/user_settings.htm
new file mode 100644
index 0000000000000000000000000000000000000000..a6ea072e01ed8a19272e01b1b144224182c3e1a8
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/tools/user_settings.htm
@@ -0,0 +1,39 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_usersettings">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels">
+            <div class="ctrlHolder">
+                <label for="passwort">{tmpl_var name='passwort_txt'}</label>
+                <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/>&nbsp;<a href="javascript:void(0);" onClick="generatePassword('passwort');">{tmpl_var name='generate_password_txt'}</a>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='password_strength_txt'}</p>
+                <div id="passBar"></div>
+                <p class="formHint"><span id="passText">&nbsp;</span></p>
+            </div>
+            <div class="ctrlHolder">
+                <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;"  onkeyup="checkPassMatch('passwort','repeat_password');" />
+            </div>
+            <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+            <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+            <div class="ctrlHolder">
+                <label for="language">{tmpl_var name='language_txt'}</label>
+                <select name="language" id="language" class="selectInput flags">
+                    {tmpl_var name='language'}
+                </select>
+            </div>
+        </fieldset>
+        
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','tools/user_settings.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('tools/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/topnav.tpl.htm b/interface/web/themes/default-v2/templates/topnav.tpl.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b86b9ab4b9f1b8019268376352d3b9952ef58466
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/topnav.tpl.htm
@@ -0,0 +1,9 @@
+<ul id="topmenu">
+    <tmpl_loop name="nav_top">
+        <tmpl_if name="active">
+            <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+        <tmpl_else>
+            <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+        </tmpl_if>
+    </tmpl_loop>
+</ul>
diff --git a/interface/web/themes/default-v2/templates/vm/openvz.conf.tpl b/interface/web/themes/default-v2/templates/vm/openvz.conf.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..5bdd385a46d1a0455c261aa16625e871f03bfd46
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz.conf.tpl
@@ -0,0 +1,50 @@
+
+# Template version
+VERSION="2"
+
+# Parameters
+ONBOOT="{tmpl_var name='onboot'}"
+KMEMSIZE="{tmpl_var name='kmemsize'}"
+LOCKEDPAGES="{tmpl_var name='lockedpages'}"
+PRIVVMPAGES="{tmpl_var name='privvmpages'}"
+SHMPAGES="{tmpl_var name='shmpages'}"
+NUMPROC="{tmpl_var name='numproc'}"
+PHYSPAGES="{tmpl_var name='physpages'}"
+VMGUARPAGES="{tmpl_var name='vmguarpages'}"
+OOMGUARPAGES="{tmpl_var name='oomguarpages'}"
+NUMTCPSOCK="{tmpl_var name='numtcpsock'}"
+NUMFLOCK="{tmpl_var name='numflock'}"
+NUMPTY="{tmpl_var name='numpty'}"
+NUMSIGINFO="{tmpl_var name='numsiginfo'}"
+TCPSNDBUF="{tmpl_var name='tcpsndbuf'}"
+TCPRCVBUF="{tmpl_var name='tcprcvbuf'}"
+OTHERSOCKBUF="{tmpl_var name='othersockbuf'}"
+DGRAMRCVBUF="{tmpl_var name='dgramrcvbuf'}"
+NUMOTHERSOCK="{tmpl_var name='numothersock'}"
+DCACHESIZE="{tmpl_var name='dcachesize'}"
+NUMFILE="{tmpl_var name='numfile'}"
+AVNUMPROC="{tmpl_var name='avnumproc'}"
+NUMIPTENT="{tmpl_var name='numiptent'}"
+
+DISKSPACE="{tmpl_var name='diskspace'}"
+DISKINODES="{tmpl_var name='diskinodes'}"
+QUOTAUGIDLIMIT="10000"
+IOPRIO="{tmpl_var name='io_priority'}"
+QUOTATIME="0"
+
+CPUS="{tmpl_var name='cpu_num'}"
+CPUUNITS="{tmpl_var name='cpu_units'}"
+CPULIMIT="{tmpl_var name='cpu_limit'}"
+
+VE_ROOT="/vz/root/$VEID"
+VE_PRIVATE="/vz/private/$VEID"
+OSTEMPLATE="{tmpl_var name='ostemplate'}"
+ORIGIN_SAMPLE="vps.basic"
+HOSTNAME="{tmpl_var name='hostname'}"
+IP_ADDRESS="{tmpl_var name='ip_address'}"
+NAMESERVER="{tmpl_var name='nameserver'}"
+# alternative meminfo: "pages:256000"
+MEMINFO="privvmpages:1"
+# SWAPPAGES="{tmpl_var name='swappages'}"
+
+CAPABILITY="{tmpl_var name='capability'}"
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_action.htm b/interface/web/themes/default-v2/templates/vm/openvz_action.htm
new file mode 100644
index 0000000000000000000000000000000000000000..057c851dc3ccc731b7d822deef4b2897a70a6eac
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_action.htm
@@ -0,0 +1,53 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_language_import">
+  
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>{tmpl_var name="head_txt"} {tmpl_var name='veid'}</legend>
+            
+            <tmpl_if name="msg">
+                <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+            </tmpl_if>
+            <tmpl_if name="error">
+                <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+            </tmpl_if>
+                
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='start_txt'}</p>
+                <div class="multiField">
+                    <input id="action" type="radio" value="start" name="action" {tmpl_var name='start_option_enabled'}/>
+                </div>
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='stop_txt'}</p>
+                <div class="multiField">
+                    <input id="action" type="radio" value="stop" name="action" {tmpl_var name='stop_option_enabled'}/>
+                </div>
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='restart_txt'}</p>
+                <div class="multiField">
+                    <input id="action" type="radio" value="restart" name="action" {tmpl_var name='restart_option_enabled'}/>
+                </div>
+            </div>
+                
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='ostemplate_txt'}</p>
+                <div class="multiField">
+                    <input style="float:left; margin-right:10px;" id="action" type="radio" value="ostemplate" name="action" {tmpl_var name='ostemplate_option_enabled'}/>
+                           <input name="ostemplate_name" size="30" maxlength="255" type="text" class="textInput" value="{tmpl_var name='ostemplate_name'}" onclick="$('[name=action]').filter('[value=ostemplate]').attr('checked','checked');" /> &nbsp;{tmpl_var name='ostemplate_desc_txt'}
+                </div>
+            </div>
+        </fieldset>     
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_action.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_vm_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ip_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_ip_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..8b8f34b62bc26eebccfb9dcf88b502d1ada6e33a
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_ip_edit.htm
@@ -0,0 +1,46 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_ip">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>IP address</legend>
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+                <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="15" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="vm_id">{tmpl_var name='vm_id_txt'}</label>
+                <select name="vm_id" id="vm_id" class="selectInput" disabled="disabled">
+                    {tmpl_var name='vm_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='reserved_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='reserved'}
+                </div>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_ip_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_ip_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    var vm_id = jQuery('#vm_id').val();
+    jQuery('#vm_id').attr({name: 'vm_id_disabled', id: 'vm_id_disabled'});
+    jQuery('#vm_id_disabled').after('<input type="hidden" name="vm_id" value="'+vm_id+'">');
+    
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ip_list.htm b/interface/web/themes/default-v2/templates/vm/openvz_ip_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..886d4b9e84da912df8c4612f8494e5c5149d2cc5
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_ip_list.htm
@@ -0,0 +1,58 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_openvz_ip">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ip_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_vm_id" scope="col"><tmpl_var name="vm_id_txt"></th>
+                        <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
+                        <th class="tbl_col_reserved" scope="col"><tmpl_var name="reserved_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_vm_id"><select name="search_vm_id">{tmpl_var name='search_vm_id'}</select></td>
+                        <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
+                        <td class="tbl_col_reserved"><select name="search_reserved">{tmpl_var name='search_reserved'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_vm_id"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="vm_id"}</a></td>
+                            <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
+                            <td class="tbl_col_reserved"><a href="#" onClick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="reserved"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6f08d1506468fd7a3aed5050a0d413e89f86da52
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_edit.htm
@@ -0,0 +1,48 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_ostemplate">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Domain</legend>
+            <div class="ctrlHolder">
+                <label for="template_name">{tmpl_var name='template_name_txt'}</label>
+                <input name="template_name" id="template_name" value="{tmpl_var name='template_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="template_file">{tmpl_var name='template_file_txt'}</label>
+                <input name="template_file" id="template_file" value="{tmpl_var name='template_file'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                <select name="server_id" id="server_id" class="selectInput">
+                    {tmpl_var name='server_id'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='allservers_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='allservers'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="description">{tmpl_var name='description_txt'}</label>
+                <textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea>
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_ostemplate_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_ostemplate_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_list.htm b/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c15277422abca6ab254b3b0bb574abc322413665
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_ostemplate_list.htm
@@ -0,0 +1,61 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_openvz_ostemplate">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_ostemplate_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_ostemplate_id" scope="col"><tmpl_var name="ostemplate_id_txt"></th>
+                        <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_allservers" scope="col"><tmpl_var name="allservers_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_ostemplate_id"><input type="text" name="search_ostemplate_id" value="{tmpl_var name='search_ostemplate_id'}" style="width:30px;" /></td>
+                        <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_allservers"><select name="search_allservers">{tmpl_var name='search_allservers'}</select></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_ostemplate_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_ostemplate_id"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ostemplate_id"}</a></td>
+                            <td class="tbl_col_template_name"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_allservers"><a href="#" onClick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="allservers"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_ostemplate_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_template_advanced_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_template_advanced_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6741ce9ab3e4e321af69579156930b7b7df3d7f9
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_template_advanced_edit.htm
@@ -0,0 +1,110 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_template">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Advanced</legend>
+            <div class="ctrlHolder">
+                <label for="numproc">{tmpl_var name='numproc_txt'}</label>
+                <input name="numproc" id="numproc" value="{tmpl_var name='numproc'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numtcpsock">{tmpl_var name='numtcpsock_txt'}</label>
+                <input name="numtcpsock" id="numtcpsock" value="{tmpl_var name='numtcpsock'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numothersock">{tmpl_var name='numothersock_txt'}</label>
+                <input name="numothersock" id="numothersock" value="{tmpl_var name='numothersock'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="vmguarpages">{tmpl_var name='vmguarpages_txt'}</label>
+                <input name="vmguarpages" id="vmguarpages" value="{tmpl_var name='vmguarpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="kmemsize">{tmpl_var name='kmemsize_txt'}</label>
+                <input name="kmemsize" id="kmemsize" value="{tmpl_var name='kmemsize'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="tcpsndbuf">{tmpl_var name='tcpsndbuf_txt'}</label>
+                <input name="tcpsndbuf" id="tcpsndbuf" value="{tmpl_var name='tcpsndbuf'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="tcprcvbuf">{tmpl_var name='tcprcvbuf_txt'}</label>
+                <input name="tcprcvbuf" id="tcprcvbuf" value="{tmpl_var name='tcprcvbuf'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="othersockbuf">{tmpl_var name='othersockbuf_txt'}</label>
+                <input name="othersockbuf" id="othersockbuf" value="{tmpl_var name='othersockbuf'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dgramrcvbuf">{tmpl_var name='dgramrcvbuf_txt'}</label>
+                <input name="dgramrcvbuf" id="dgramrcvbuf" value="{tmpl_var name='dgramrcvbuf'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="oomguarpages">{tmpl_var name='oomguarpages_txt'}</label>
+                <input name="oomguarpages" id="oomguarpages" value="{tmpl_var name='oomguarpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="privvmpages">{tmpl_var name='privvmpages_txt'}</label>
+                <input name="privvmpages" id="privvmpages" value="{tmpl_var name='privvmpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="lockedpages">{tmpl_var name='lockedpages_txt'}</label>
+                <input name="lockedpages" id="lockedpages" value="{tmpl_var name='lockedpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="shmpages">{tmpl_var name='shmpages_txt'}</label>
+                <input name="shmpages" id="shmpages" value="{tmpl_var name='shmpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="physpages">{tmpl_var name='physpages_txt'}</label>
+                <input name="physpages" id="physpages" value="{tmpl_var name='physpages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numfile">{tmpl_var name='numfile_txt'}</label>
+                <input name="numfile" id="numfile" value="{tmpl_var name='numfile'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="avnumproc">{tmpl_var name='avnumproc_txt'}</label>
+                <input name="avnumproc" id="avnumproc" value="{tmpl_var name='avnumproc'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numflock">{tmpl_var name='numflock_txt'}</label>
+                <input name="numflock" id="numflock" value="{tmpl_var name='numflock'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numpty">{tmpl_var name='numpty_txt'}</label>
+                <input name="numpty" id="numpty" value="{tmpl_var name='numpty'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numsiginfo">{tmpl_var name='numsiginfo_txt'}</label>
+                <input name="numsiginfo" id="numsiginfo" value="{tmpl_var name='numsiginfo'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="dcachesize">{tmpl_var name='dcachesize_txt'}</label>
+                <input name="dcachesize" id="dcachesize" value="{tmpl_var name='dcachesize'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="numiptent">{tmpl_var name='numiptent_txt'}</label>
+                <input name="numiptent" id="numiptent" value="{tmpl_var name='numiptent'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="swappages">{tmpl_var name='swappages_txt'}</label>
+                <input name="swappages" id="swappages" value="{tmpl_var name='swappages'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="capability">{tmpl_var name='capability_txt'}</label>
+                <input name="capability" id="capability" value="{tmpl_var name='capability'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_template_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_template_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ce356afeec2e7427a0657d47fac413d5fe92529e
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_template_edit.htm
@@ -0,0 +1,74 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_template">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Template</legend>
+            <div class="ctrlHolder">
+                <label for="template_name">{tmpl_var name='template_name_txt'}</label>
+                <input name="template_name" id="template_name" value="{tmpl_var name='template_name'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="diskspace">{tmpl_var name='diskspace_txt'}</label>
+                <input name="diskspace" id="diskspace" value="{tmpl_var name='diskspace'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;GB
+            </div>
+            <div class="ctrlHolder">
+                <label for="ram">{tmpl_var name='ram_txt'}</label>
+                <input name="ram" id="ram" value="{tmpl_var name='ram'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="ram_burst">{tmpl_var name='ram_burst_txt'}</label>
+                <input name="ram_burst" id="ram_burst" value="{tmpl_var name='ram_burst'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_units">{tmpl_var name='cpu_units_txt'}</label>
+                <input name="cpu_units" id="cpu_units" value="{tmpl_var name='cpu_units'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(8 - 500000)
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_num">{tmpl_var name='cpu_num_txt'}</label>
+                <input name="cpu_num" id="cpu_num" value="{tmpl_var name='cpu_num'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(1 - 64)
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_limit">{tmpl_var name='cpu_limit_txt'}</label>
+                <input name="cpu_limit" id="cpu_limit" value="{tmpl_var name='cpu_limit'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(10 - 6400)
+            </div>
+            <div class="ctrlHolder">
+                <label for="io_priority">{tmpl_var name='io_priority_txt'}</label>
+                <input name="io_priority" id="io_priority" value="{tmpl_var name='io_priority'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(0 - 7)
+            </div>
+            <div class="ctrlHolder">
+                <label for="hostname">{tmpl_var name='hostname_txt'}</label>
+                <input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='create_dns_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='create_dns'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="nameserver">{tmpl_var name='nameserver_txt'}</label>
+                <input name="nameserver" id="nameserver" value="{tmpl_var name='nameserver'}" size="30" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='nameserver_desc_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="description">{tmpl_var name='description_txt'}</label>
+                <textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_template_list.htm b/interface/web/themes/default-v2/templates/vm/openvz_template_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..78f102bf792de4cb9decc7688f429b3f6e3a2d3f
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_template_list.htm
@@ -0,0 +1,52 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_openvz_template">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_template_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('vm/openvz_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_template_name"><a href="#" onClick="loadContent('vm/openvz_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+    
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_vm_advanced_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_vm_advanced_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..a0bf42d3e4cd4380e7e8063f71b8148f0bff5e5b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_vm_advanced_edit.htm
@@ -0,0 +1,64 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_vm">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Advanced</legend>
+            <div class="ctrlHolder">
+                <label for="veid">{tmpl_var name='veid_txt'}</label>
+                <input name="veid" id="veid" value="{tmpl_var name='veid'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='create_dns_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='create_dns'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="diskspace">{tmpl_var name='diskspace_txt'}</label>
+                <input name="diskspace" id="diskspace" value="{tmpl_var name='diskspace'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;GB
+            </div>
+            <div class="ctrlHolder">
+                <label for="ram">{tmpl_var name='ram_txt'}</label>
+                <input name="ram" id="ram" value="{tmpl_var name='ram'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="ram_burst">{tmpl_var name='ram_burst_txt'}</label>
+                <input name="ram_burst" id="ram_burst" value="{tmpl_var name='ram_burst'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> &nbsp;MB
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_units">{tmpl_var name='cpu_units_txt'}</label>
+                <input name="cpu_units" id="cpu_units" value="{tmpl_var name='cpu_units'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(8 - 500000)
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_num">{tmpl_var name='cpu_num_txt'}</label>
+                <input name="cpu_num" id="cpu_num" value="{tmpl_var name='cpu_num'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(1 - 64)
+            </div>
+            <div class="ctrlHolder">
+                <label for="cpu_limit">{tmpl_var name='cpu_limit_txt'}</label>
+                <input name="cpu_limit" id="cpu_limit" value="{tmpl_var name='cpu_limit'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(10 - 6400)
+            </div>
+            <div class="ctrlHolder">
+                <label for="io_priority">{tmpl_var name='io_priority_txt'}</label>
+                <input name="io_priority" id="io_priority" value="{tmpl_var name='io_priority'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />&nbsp;(0 - 7)
+            </div>
+            <div class="ctrlHolder">
+                <label for="nameserver">{tmpl_var name='nameserver_txt'}</label>
+                <input name="nameserver" id="nameserver" value="{tmpl_var name='nameserver'}" size="30" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='nameserver_desc_txt'}
+            </div>
+            <div class="ctrlHolder">
+                <label for="capability">{tmpl_var name='capability_txt'}</label>
+                <input name="capability" id="capability" value="{tmpl_var name='capability'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+        </fieldset>
+            
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+            
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_vm_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_vm_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_vm_edit.htm b/interface/web/themes/default-v2/templates/vm/openvz_vm_edit.htm
new file mode 100644
index 0000000000000000000000000000000000000000..402bad398c6e7c0af949f9c0c772e3929791da6b
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_vm_edit.htm
@@ -0,0 +1,107 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_openvz_vm">
+
+    <div class="pnl_formsarea">
+        <fieldset class="inlineLabels"><legend>Settings</legend>
+            <tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <tmpl_if name="edit_disabled">
+                        <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+                        <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+                            {tmpl_var name='server_id'}
+                        </select>
+                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+                    <tmpl_else>
+                            <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+                            <select name="server_id" id="server_id" class="selectInput" onChange="loadOptionInto('ip_address','vm/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
+                                {tmpl_var name='server_id'}
+                            </select>
+                    </tmpl_if>
+                </div>
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="is_reseller">
+                <div class="ctrlHolder">
+                    <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+                    <select name="client_group_id" id="client_group_id" class="selectInput">
+                        {tmpl_var name='client_group_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <tmpl_if name="edit_disabled">
+                <div class="ctrlHolder">
+                    <label for="ostemplate_id_disabled">{tmpl_var name='ostemplate_id_txt'}</label>
+                    <select name="ostemplate_id_disabled" id="ostemplate_id_disabled" class="selectInput" disabled="disabled">
+                        {tmpl_var name='ostemplate_id'}
+                    </select>
+                </div>
+                <input type="hidden" name="ostemplate_id" value="{tmpl_var name='ostemplate_id_value'}">
+            <tmpl_else>
+                <div class="ctrlHolder">
+                    <label for="ostemplate_id">{tmpl_var name='ostemplate_id_txt'}</label>
+                    <select name="ostemplate_id" id="ostemplate_id" class="selectInput">
+                        {tmpl_var name='ostemplate_id'}
+                    </select>
+                </div>
+            </tmpl_if>
+            <div class="ctrlHolder">
+                <label for="template_id">{tmpl_var name='template_id_txt'}</label>
+                <select name="template_id" id="template_id" class="selectInput">
+                    {tmpl_var name='template_id_select'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
+                <select name="ip_address" id="ip_address" class="selectInput">
+                    {tmpl_var name='ip_address'}
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="hostname">{tmpl_var name='hostname_txt'}</label>
+                <input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="vm_password">{tmpl_var name='vm_password_txt'}</label>
+                <input name="vm_password" id="vm_password" value="{tmpl_var name='vm_password'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='start_boot_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='start_boot'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='active_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='active'}
+                </div>
+            </div>
+            <div class="ctrlHolder">
+                <label for="active_until_date">{tmpl_var name='active_until_date_txt'}</label>
+                <input name="active_until_date" id="active_until_date" value="{tmpl_var name='active_until_date'}" size="30" maxlength="255" type="text" class="textInput formLengthDate" />
+            </div>
+            <div class="ctrlHolder">
+                <label for="description">{tmpl_var name='description_txt'}</label>
+                <textarea name="description" id="description" rows='5' cols='30' style='height:60px;'>{tmpl_var name='description'}</textarea>
+            </div>
+        </fieldset>
+
+        <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+        <div class="buttonHolder buttons">
+            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','vm/openvz_vm_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('vm/openvz_vm_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+        </div>
+    </div>
+  
+</div>
+<script language="JavaScript" type="text/javascript">
+    jQuery( "#active_until_date" ).datepicker({ dateFormat: '<tmpl_var name="date_format">', changeMonth: true, changeYear: true, yearRange: '-100:+100', dayNamesMin: ['<tmpl_var name="daynamesmin_su">','<tmpl_var name="daynamesmin_mo">','<tmpl_var name="daynamesmin_tu">','<tmpl_var name="daynamesmin_we">','<tmpl_var name="daynamesmin_th">','<tmpl_var name="daynamesmin_fr">','<tmpl_var name="daynamesmin_sa">'], dayNames: ['<tmpl_var name="daynames_sunday">','<tmpl_var name="daynames_monday">','<tmpl_var name="daynames_tuesday">','<tmpl_var name="daynames_wednesday">','<tmpl_var name="daynames_thursday">','<tmpl_var name="daynames_friday">','<tmpl_var name="daynames_saturday">'], monthNamesShort: ['<tmpl_var name="monthnamesshort_jan">','<tmpl_var name="monthnamesshort_feb">','<tmpl_var name="monthnamesshort_mar">','<tmpl_var name="monthnamesshort_apr">','<tmpl_var name="monthnamesshort_may">','<tmpl_var name="monthnamesshort_jun">','<tmpl_var name="monthnamesshort_jul">','<tmpl_var name="monthnamesshort_aug">','<tmpl_var name="monthnamesshort_sep">','<tmpl_var name="monthnamesshort_oct">','<tmpl_var name="monthnamesshort_nov">','<tmpl_var name="monthnamesshort_dec">'], nextText: '<tmpl_var name="datepicker_nextText">', prevText: '<tmpl_var name="datepicker_prevText">', firstDay: 1 });	
+</script>
\ No newline at end of file
diff --git a/interface/web/themes/default-v2/templates/vm/openvz_vm_list.htm b/interface/web/themes/default-v2/templates/vm/openvz_vm_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..57ad7f7b71a176e34631dac6094d256ff366cffb
--- /dev/null
+++ b/interface/web/themes/default-v2/templates/vm/openvz_vm_list.htm
@@ -0,0 +1,68 @@
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_list_openvz_vm">
+
+    <div class="pnl_toolsarea">
+        <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+            <div class="buttons">
+                <button class="iconstxt icoAdd" type="button" onClick="loadContent('vm/openvz_vm_edit.php');">
+                    <span>{tmpl_var name="add_new_record_txt"}</span>
+                </button>
+            </div>
+        </fieldset>
+    </div>
+
+    <div class="pnl_listarea">
+        <fieldset><legend><tmpl_var name="list_head_txt"></legend>
+            <table class="list">
+                <thead>
+                    <tr>
+                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
+                        <th class="tbl_col_veid" scope="col"><tmpl_var name="veid_txt"></th>
+                        <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
+                        <th class="tbl_col_ostemplate_id" scope="col"><tmpl_var name="ostemplate_id_txt"></th>
+                        <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
+                        <th class="tbl_col_hostname" scope="col"><tmpl_var name="hostname_txt"></th>
+                        <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
+                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+                    </tr>
+                    <tr>
+                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
+                        <td class="tbl_col_veid"><input type="text" name="search_veid" style="width:40px;" value="{tmpl_var name='search_veid'}" /></td>
+                        <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+                        <td class="tbl_col_ostemplate_id"><select name="search_ostemplate_id">{tmpl_var name='search_ostemplate_id'}</select></td>
+                        <td class="tbl_col_template_id"><select name="search_template_id">{tmpl_var name='search_template_id'}</select></td>
+                        <td class="tbl_col_hostname"><input type="text" name="search_hostname" value="{tmpl_var name='search_hostname'}" /></td>
+                        <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" style="width:80px;" value="{tmpl_var name='search_ip_address'}" /></td>
+                        <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','vm/openvz_vm_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tmpl_loop name="records">
+                        <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+                            <td class="tbl_col_active"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
+                            <td class="tbl_col_veid"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="veid"}</a></td>
+                            <td class="tbl_col_server_id"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
+                            <td class="tbl_col_ostemplate_id"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ostemplate_id"}</a></td>
+                            <td class="tbl_col_template_id"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_id"}</a></td>
+                            <td class="tbl_col_hostname"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hostname"}</a></td>
+                            <td class="tbl_col_ip_address"><a href="#" onClick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
+                            <td class="tbl_col_buttons">
+                                <div class="buttons icons16">    
+                                    <a class="icons16" href="#" onClick="loadContent('vm/openvz_action.php?id={tmpl_var name='id'}')" style="background-image: url('themes/default/icons/x16/arrow.png');"><span>&nbsp;</span></a>
+                                    <a class="icons16 icoDelete" href="javascript: del_record('vm/openvz_vm_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+                                </div>
+                            </td>
+                        </tr>
+                    </tmpl_loop>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </fieldset>
+    </div>
+
+</div>
\ No newline at end of file