Re-arrange the lumina-config UI a bit. Now the different sections are grouped together a bit more intuitively.

4 files changed, 785 insertions, 761 deletions

diff --git a/lumina-config/GetPluginDialog.cpp b/lumina-config/GetPluginDialog.cpp
index f0386e82..08359e2d 100644
--- a/lumina-config/GetPluginDialog.cpp
+++ b/lumina-config/GetPluginDialog.cpp
@@ -18,6 +18,7 @@ GetPluginDialog::GetPluginDialog(QWidget *parent) : QDialog(parent), ui(new Ui::
   //Load the icons
   ui->push_cancel->setIcon( LXDG::findIcon("dialog-cancel","") );
   ui->push_accept->setIcon( LXDG::findIcon("dialog-ok","") );
+  this->setWindowIcon( LXDG::findIcon("preferences-plugin") );
   //Connect the signals/slots
   connect(ui->combo_list, SIGNAL(currentIndexChanged(int)), this, SLOT(pluginchanged()) );
   connect(ui->push_cancel, SIGNAL(clicked()), this, SLOT(close()) );
diff --git a/lumina-config/mainUI.cpp b/lumina-config/mainUI.cpp
index b8155cbc..8b5877f7 100644
--- a/lumina-config/mainUI.cpp
+++ b/lumina-config/mainUI.cpp
@@ -36,6 +36,7 @@ MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI()){
 
   //Start on the Desktop page
   ui->stackedWidget->setCurrentWidget(ui->page_desktop);
+  ui->tabWidget_desktop->setCurrentWidget(ui->tab_wallpaper);
   slotChangePage(false);
   QTimer::singleShot(10, this, SLOT(loadCurrentSettings()) );
 
@@ -61,9 +62,9 @@ void MainUI::setupIcons(){
   //Pull all the icons from the current theme using libLumina (LXDG)
 
   //General UI
-  ui->actionDesktop->setIcon( LXDG::findIcon("preferences-desktop-wallpaper","") );
-  ui->actionPanels->setIcon( LXDG::findIcon("configure-toolbars","") );
-  ui->actionMenu->setIcon( LXDG::findIcon("preferences-desktop-icons","") );
+  ui->actionDesktop->setIcon( LXDG::findIcon("preferences-desktop-display","") );
+  ui->actionPanels->setIcon( LXDG::findIcon("preferences-desktop-icons","") );
+  //ui->actionMenu->setIcon( LXDG::findIcon("preferences-desktop-icons","") );
   ui->actionShortcuts->setIcon( LXDG::findIcon("configure-shortcuts","") );
   ui->actionDefaults->setIcon( LXDG::findIcon("preferences-desktop-filetype-association","") );
   ui->actionSession->setIcon( LXDG::findIcon("preferences-system-session-services","") );
@@ -73,7 +74,9 @@ void MainUI::setupIcons(){
   //Desktop Page
   ui->tool_desk_addbg->setIcon( LXDG::findIcon("list-add","") );
   ui->tool_desk_rmbg->setIcon( LXDG::findIcon("list-remove","") );
-  ui->tool_desk_addplug->setIcon( LXDG::findIcon("list-add","") );
+  ui->push_addDesktopPlugin->setIcon( LXDG::findIcon("list-add","") );
+  ui->tabWidget_desktop->setTabIcon( ui->tabWidget_desktop->indexOf(ui->tab_wallpaper), LXDG::findIcon("preferences-desktop-wallpaper","") );
+  ui->tabWidget_desktop->setTabIcon( ui->tabWidget_desktop->indexOf(ui->tab_themes), LXDG::findIcon("preferences-desktop-theme","") );
 
   //Panels Page
   ui->tool_panel1_add->setIcon( LXDG::findIcon("list-add","") );
@@ -94,7 +97,9 @@ void MainUI::setupIcons(){
   ui->tool_panel2_getcolor->setIcon( LXDG::findIcon("preferences-desktop-color","") );
   ui->toolBox_panel2->setItemIcon(0,LXDG::findIcon("preferences-desktop-display",""));
   ui->toolBox_panel2->setItemIcon(1,LXDG::findIcon("preferences-plugin",""));
-
+  ui->tabWidget_panels->setTabIcon( ui->tabWidget_panels->indexOf(ui->tab_panels), LXDG::findIcon("configure-toolbars","") );
+  ui->tabWidget_panels->setTabIcon( ui->tabWidget_panels->indexOf(ui->tab_desktopInterface), LXDG::findIcon("preferences-plugin","") );
+  
   //Menu Page
   ui->tool_menu_add->setIcon( LXDG::findIcon("list-add","") );
   ui->tool_menu_rm->setIcon( LXDG::findIcon("list-remove","") );
@@ -128,7 +133,7 @@ void MainUI::setupConnections(){
   //General UI
   connect(ui->actionDesktop, SIGNAL(triggered(bool)), this, SLOT( slotChangePage(bool)) );
   connect(ui->actionPanels, SIGNAL(triggered(bool)), this, SLOT( slotChangePage(bool)) );
-  connect(ui->actionMenu, SIGNAL(triggered(bool)), this, SLOT( slotChangePage(bool)) );
+  //connect(ui->actionMenu, SIGNAL(triggered(bool)), this, SLOT( slotChangePage(bool)) );
   connect(ui->actionShortcuts, SIGNAL(triggered(bool)), this, SLOT( slotChangePage(bool)) );
   connect(ui->actionDefaults, SIGNAL(triggered(bool)), this, SLOT( slotChangePage(bool)) );
   connect(ui->actionSession, SIGNAL(triggered(bool)), this, SLOT( slotChangePage(bool)) );
@@ -136,10 +141,10 @@ void MainUI::setupConnections(){
   connect(ui->spin_screen, SIGNAL(valueChanged(int)), this, SLOT(slotChangeScreen()) );
 
   //Desktop Page
-  connect(ui->combo_desk_plugs, SIGNAL(currentIndexChanged(int)), this, SLOT(deskplugchanged()) );
+  //connect(ui->combo_desk_plugs, SIGNAL(currentIndexChanged(int)), this, SLOT(deskplugchanged()) );
   connect(ui->combo_desk_bg, SIGNAL(currentIndexChanged(int)), this, SLOT(deskbgchanged()) );
   connect(ui->radio_desk_multi, SIGNAL(toggled(bool)), this, SLOT(desktimechanged()) );
-  connect(ui->tool_desk_addplug, SIGNAL(clicked()), this, SLOT(deskplugadded()) );
+  connect(ui->push_addDesktopPlugin, SIGNAL(clicked()), this, SLOT(deskplugadded()) );
   connect(ui->tool_desk_addbg, SIGNAL(clicked()), this, SLOT(deskbgadded()) );
   connect(ui->tool_desk_rmbg, SIGNAL(clicked()), this, SLOT(deskbgremoved()) );
   connect(ui->spin_desk_min, SIGNAL(valueChanged(int)), this, SLOT(desktimechanged()) );
@@ -220,7 +225,7 @@ void MainUI::setupConnections(){
 
 void MainUI::setupMenus(){
   //Desktop Plugin Menu
-  ui->combo_desk_plugs->clear();
+  /*ui->combo_desk_plugs->clear();
   QStringList plugs = PINFO->desktopPlugins();
   for(int i=0; i<plugs.length(); i++){
     LPI info = PINFO->desktopPluginInfo(plugs[i]);
@@ -228,6 +233,7 @@ void MainUI::setupMenus(){
   }
   ui->tool_desk_addplug->setEnabled(!plugs.isEmpty());
   deskplugchanged(); //make sure it loads the right info
+  */
 
   //Panel locations
   ui->combo_panel1_loc->clear();
@@ -365,7 +371,7 @@ void MainUI::slotChangePage(bool enabled){
     //Re-enable the current button
     ui->actionDesktop->setChecked(ui->stackedWidget->currentWidget()==ui->page_desktop);
     ui->actionPanels->setChecked(ui->stackedWidget->currentWidget()==ui->page_panels);
-    ui->actionMenu->setChecked(ui->stackedWidget->currentWidget()==ui->page_menu);
+    //ui->actionMenu->setChecked(ui->stackedWidget->currentWidget()==ui->page_menu);
     ui->actionShortcuts->setChecked(ui->stackedWidget->currentWidget()==ui->page_shortcuts);
     ui->actionDefaults->setChecked(ui->stackedWidget->currentWidget()==ui->page_defaults);
     ui->actionSession->setChecked(ui->stackedWidget->currentWidget()==ui->page_session);
@@ -376,14 +382,14 @@ void MainUI::slotChangePage(bool enabled){
     //uncheck the button associated with the currently open page
     if(ui->stackedWidget->currentWidget()==ui->page_desktop){ ui->actionDesktop->setChecked(false); }
     if(ui->stackedWidget->currentWidget()==ui->page_panels){ ui->actionPanels->setChecked(false); }
-    if(ui->stackedWidget->currentWidget()==ui->page_menu){ ui->actionMenu->setChecked(false); }
+    //if(ui->stackedWidget->currentWidget()==ui->page_menu){ ui->actionMenu->setChecked(false); }
     if(ui->stackedWidget->currentWidget()==ui->page_shortcuts){ ui->actionShortcuts->setChecked(false); }
     if(ui->stackedWidget->currentWidget()==ui->page_defaults){ ui->actionDefaults->setChecked(false); }
     if(ui->stackedWidget->currentWidget()==ui->page_session){ ui->actionSession->setChecked(false); }
     //switch to the new page
     if(ui->actionDesktop->isChecked()){ ui->stackedWidget->setCurrentWidget(ui->page_desktop); showScreen=true;}
     else if(ui->actionPanels->isChecked()){ ui->stackedWidget->setCurrentWidget(ui->page_panels); showScreen=true; }
-    else if(ui->actionMenu->isChecked()){ ui->stackedWidget->setCurrentWidget(ui->page_menu); }
+    //else if(ui->actionMenu->isChecked()){ ui->stackedWidget->setCurrentWidget(ui->page_menu); }
     else if(ui->actionShortcuts->isChecked()){ ui->stackedWidget->setCurrentWidget(ui->page_shortcuts); }
     else if(ui->actionDefaults->isChecked()){ ui->stackedWidget->setCurrentWidget(ui->page_defaults); }
     else if(ui->actionSession->isChecked()){ ui->stackedWidget->setCurrentWidget(ui->page_session); }
@@ -676,7 +682,7 @@ void MainUI::saveCurrentSettings(bool screenonly){
 //===============
 //    DESKTOP PAGE
 //===============
-void MainUI::deskplugchanged(){
+/*void MainUI::deskplugchanged(){
   //NOTE: This is not a major change and will not enable the save button
   if(ui->combo_desk_plugs->count()==0){
     //No plugins available
@@ -687,7 +693,7 @@ void MainUI::deskplugchanged(){
   QString plug = ui->combo_desk_plugs->itemData( ui->combo_desk_plugs->currentIndex() ).toString();
   LPI info = PINFO->desktopPluginInfo(plug);
   ui->label_desk_pluginfo->setText( info.description );
-}
+}*/
 
 void MainUI::deskbgchanged(){
   //Load the new image preview
@@ -752,7 +758,12 @@ void MainUI::deskbgadded(){
 }
 
 void MainUI::deskplugadded(){
-  QString newplug = ui->combo_desk_plugs->itemData( ui->combo_desk_plugs->currentIndex() ).toString();
+  GetPluginDialog dlg(this);
+    dlg.LoadPlugins("desktop", PINFO);
+    dlg.exec();
+  if( !dlg.selected ){ return; } //cancelled
+  QString newplug = dlg.plugID;
+  //QString newplug = ui->combo_desk_plugs->itemData( ui->combo_desk_plugs->currentIndex() ).toString();
   if(newplug=="applauncher"){
     //Prompt for the application to add
     XDGDesktop app = getSysApp();
diff --git a/lumina-config/mainUI.h b/lumina-config/mainUI.h
index b3d03664..27c59968 100644
--- a/lumina-config/mainUI.h
+++ b/lumina-config/mainUI.h
@@ -98,7 +98,7 @@ private slots:
 	void saveCurrentSettings(bool screenonly = false);
 
 	//Desktop Page
-	void deskplugchanged();
+	//void deskplugchanged();
 	void deskbgchanged();
 	void desktimechanged();
 	void deskbgremoved();
@@ -128,7 +128,7 @@ private slots:
 	void dnpanel1plugin();
 	void dnpanel2plugin();
 
-	//Menu Page
+	//Menu Page/Tab
 	void addmenuplugin();
 	void rmmenuplugin();
 	void upmenuplugin();
diff --git a/lumina-config/mainUI.ui b/lumina-config/mainUI.ui
index 534f6b9a..99888a26 100644
--- a/lumina-config/mainUI.ui
+++ b/lumina-config/mainUI.ui
@@ -34,22 +34,25 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="QGroupBox" name="group_screen">
-      <property name="title">
-       <string/>
+     <widget class="QFrame" name="group_screen">
+      <property name="frameShape">
+       <enum>QFrame::StyledPanel</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
       </property>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QHBoxLayout" name="horizontalLayout_18">
        <property name="leftMargin">
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>0</number>
+        <number>1</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>0</number>
+        <number>1</number>
        </property>
        <item>
         <spacer name="horizontalSpacer_3">
@@ -58,7 +61,7 @@
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>40</width>
+           <width>195</width>
            <height>20</height>
           </size>
          </property>
@@ -111,434 +114,311 @@
       <widget class="QWidget" name="page_desktop">
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_4">
-          <item>
-           <widget class="QToolButton" name="tool_desk_addbg">
-            <property name="text">
-             <string notr="true">add</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="tool_desk_rmbg">
-            <property name="text">
-             <string notr="true">rm</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="combo_desk_bg"/>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
-          <item>
-           <layout class="QVBoxLayout" name="verticalLayout_2">
-            <item>
-             <widget class="Line" name="line_4">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_desk_res">
-              <property name="text">
-               <string notr="true">(Resolution)</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-              <property name="wordWrap">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="Line" name="line_2">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="radio_desk_single">
-              <property name="text">
-               <string>Single Background</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="radio_desk_multi">
-              <property name="text">
-               <string>Rotate Background</string>
-              </property>
-             </widget>
-            </item>
+         <widget class="QTabWidget" name="tabWidget_desktop">
+          <property name="currentIndex">
+           <number>0</number>
+          </property>
+          <widget class="QWidget" name="tab_wallpaper">
+           <attribute name="title">
+            <string>Wallpaper</string>
+           </attribute>
+           <layout class="QVBoxLayout" name="verticalLayout_16">
             <item>
-             <widget class="QSpinBox" name="spin_desk_min">
-              <property name="suffix">
-               <string> Minutes</string>
-              </property>
-              <property name="prefix">
-               <string>Every </string>
-              </property>
-              <property name="minimum">
-               <number>1</number>
-              </property>
-              <property name="maximum">
-               <number>120</number>
-              </property>
-              <property name="value">
-               <number>5</number>
-              </property>
-             </widget>
+             <layout class="QHBoxLayout" name="horizontalLayout_4">
+              <item>
+               <widget class="QToolButton" name="tool_desk_addbg">
+                <property name="text">
+                 <string notr="true">add</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QToolButton" name="tool_desk_rmbg">
+                <property name="text">
+                 <string notr="true">rm</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="combo_desk_bg"/>
+              </item>
+             </layout>
             </item>
             <item>
-             <spacer name="verticalSpacer">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>40</height>
-               </size>
-              </property>
-             </spacer>
+             <layout class="QHBoxLayout" name="horizontalLayout_5">
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_2">
+                <item>
+                 <widget class="Line" name="line_4">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="label_desk_res">
+                  <property name="text">
+                   <string notr="true">(Resolution)</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="Line" name="line_2">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QRadioButton" name="radio_desk_single">
+                  <property name="text">
+                   <string>Single Background</string>
+                  </property>
+                  <property name="checked">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QRadioButton" name="radio_desk_multi">
+                  <property name="text">
+                   <string>Rotate Background</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QSpinBox" name="spin_desk_min">
+                  <property name="suffix">
+                   <string> Minutes</string>
+                  </property>
+                  <property name="prefix">
+                   <string>Every </string>
+                  </property>
+                  <property name="minimum">
+                   <number>1</number>
+                  </property>
+                  <property name="maximum">
+                   <number>120</number>
+                  </property>
+                  <property name="value">
+                   <number>5</number>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="verticalSpacer">
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>40</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_desk_bgview">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="frameShape">
+                 <enum>QFrame::StyledPanel</enum>
+                </property>
+                <property name="text">
+                 <string notr="true">BG-sample</string>
+                </property>
+                <property name="scaledContents">
+                 <bool>false</bool>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+               </widget>
+              </item>
+             </layout>
             </item>
            </layout>
-          </item>
-          <item>
-           <widget class="QLabel" name="label_desk_bgview">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="frameShape">
-             <enum>QFrame::StyledPanel</enum>
-            </property>
-            <property name="text">
-             <string notr="true">BG-sample</string>
-            </property>
-            <property name="scaledContents">
-             <bool>false</bool>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="Line" name="line">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="groupBox">
-          <property name="title">
-           <string>Add Desktop Plugins</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_6">
-           <property name="topMargin">
-            <number>2</number>
-           </property>
-           <property name="bottomMargin">
-            <number>1</number>
-           </property>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_3">
-             <item>
-              <widget class="QToolButton" name="tool_desk_addplug">
-               <property name="toolTip">
-                <string>Add the selected plugin to the desktop</string>
-               </property>
-               <property name="text">
-                <string>Plugin</string>
-               </property>
-               <property name="toolButtonStyle">
-                <enum>Qt::ToolButtonTextBesideIcon</enum>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="combo_desk_plugs">
-               <property name="sizeAdjustPolicy">
-                <enum>QComboBox::AdjustToContents</enum>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_15">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_desk_pluginfo">
-             <property name="text">
-              <string notr="true"/>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="page_panels">
-       <layout class="QGridLayout" name="gridLayout_panels">
-        <property name="sizeConstraint">
-         <enum>QLayout::SetMinAndMaxSize</enum>
-        </property>
-        <item row="0" column="0">
-         <layout class="QHBoxLayout" name="horizontalLayout_6">
-          <item>
-           <widget class="QToolButton" name="tool_panel1_add">
-            <property name="text">
-             <string notr="true">add</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="tool_panel1_rm">
-            <property name="text">
-             <string notr="true">rem</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label_panel1">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>Panel #1</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="1" column="1">
-         <widget class="QToolBox" name="toolBox_panel2">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="frameShape">
-           <enum>QFrame::StyledPanel</enum>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
-          </property>
-          <property name="lineWidth">
-           <number>1</number>
-          </property>
-          <property name="midLineWidth">
-           <number>2</number>
-          </property>
-          <property name="currentIndex">
-           <number>0</number>
-          </property>
-          <widget class="QWidget" name="page_panel2_appearance">
-           <property name="geometry">
-            <rect>
-             <x>0</x>
-             <y>0</y>
-             <width>262</width>
-             <height>187</height>
-            </rect>
-           </property>
-           <attribute name="label">
-            <string>Appearance</string>
+          </widget>
+          <widget class="QWidget" name="tab_themes">
+           <attribute name="title">
+            <string>Theme</string>
            </attribute>
-           <layout class="QFormLayout" name="formLayout_2">
-            <property name="fieldGrowthPolicy">
-             <enum>QFormLayout::ExpandingFieldsGrow</enum>
-            </property>
+           <layout class="QFormLayout" name="formLayout_5">
             <item row="0" column="0">
-             <widget class="QLabel" name="label_7">
+             <widget class="QLabel" name="label_12">
               <property name="text">
-               <string>Location:</string>
+               <string>Font:</string>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
-             <widget class="QComboBox" name="combo_panel2_loc">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
+             <widget class="QFontComboBox" name="font_session_theme">
+              <property name="editable">
+               <bool>false</bool>
               </property>
              </widget>
             </item>
             <item row="1" column="0">
-             <widget class="QLabel" name="label_8">
+             <widget class="QLabel" name="label_14">
               <property name="text">
-               <string>Size:</string>
+               <string>Font Size:</string>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
-             <widget class="QSpinBox" name="spin_panel2_size"/>
+             <widget class="QSpinBox" name="spin_session_fontsize">
+              <property name="suffix">
+               <string> point</string>
+              </property>
+             </widget>
             </item>
-            <item row="4" column="0">
-             <widget class="QLabel" name="label_9">
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_16">
               <property name="text">
-               <string>Custom Color:</string>
+               <string>Theme Template:</string>
               </property>
              </widget>
             </item>
-            <item row="4" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_10">
+            <item row="2" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_12">
               <item>
-               <widget class="QLabel" name="label_panel2_sample">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="frameShape">
-                 <enum>QFrame::StyledPanel</enum>
-                </property>
-                <property name="text">
-                 <string>Sample</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
+               <widget class="QComboBox" name="combo_session_themefile">
+                <property name="sizeAdjustPolicy">
+                 <enum>QComboBox::AdjustToContents</enum>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QToolButton" name="tool_panel2_getcolor">
+               <widget class="QToolButton" name="tool_session_newtheme">
+                <property name="toolTip">
+                 <string>Create/Edit a theme template (Advanced)</string>
+                </property>
+                <property name="statusTip">
+                 <string/>
+                </property>
                 <property name="text">
-                 <string>...</string>
+                 <string>Edit</string>
+                </property>
+                <property name="toolButtonStyle">
+                 <enum>Qt::ToolButtonTextBesideIcon</enum>
                 </property>
                </widget>
               </item>
              </layout>
             </item>
-            <item row="2" column="1">
-             <widget class="QCheckBox" name="check_panel2_hidepanel">
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_17">
               <property name="text">
-               <string>Auto-hide Panel </string>
+               <string>Color Scheme:</string>
               </property>
              </widget>
             </item>
             <item row="3" column="1">
-             <widget class="QCheckBox" name="check_panel2_usetheme">
+             <layout class="QHBoxLayout" name="horizontalLayout_19">
+              <item>
+               <widget class="QComboBox" name="combo_session_colorfile">
+                <property name="sizeAdjustPolicy">
+                 <enum>QComboBox::AdjustToContents</enum>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QToolButton" name="tool_session_newcolor">
+                <property name="toolTip">
+                 <string>Create/Edit a color scheme</string>
+                </property>
+                <property name="statusTip">
+                 <string/>
+                </property>
+                <property name="text">
+                 <string>Edit</string>
+                </property>
+                <property name="toolButtonStyle">
+                 <enum>Qt::ToolButtonTextBesideIcon</enum>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item row="4" column="0">
+             <widget class="QLabel" name="label_18">
               <property name="text">
-               <string>Follow Theme</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
+               <string>Icon Pack:</string>
               </property>
              </widget>
             </item>
+            <item row="4" column="1">
+             <widget class="QComboBox" name="combo_session_icontheme"/>
+            </item>
            </layout>
           </widget>
-          <widget class="QWidget" name="page_panel2_plugins">
-           <property name="geometry">
-            <rect>
-             <x>0</x>
-             <y>0</y>
-             <width>197</width>
-             <height>117</height>
-            </rect>
-           </property>
-           <attribute name="label">
-            <string>Plugins</string>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="page_panels">
+       <layout class="QVBoxLayout" name="verticalLayout_17">
+        <item>
+         <widget class="QTabWidget" name="tabWidget_panels">
+          <property name="currentIndex">
+           <number>0</number>
+          </property>
+          <widget class="QWidget" name="tab_desktopInterface">
+           <attribute name="title">
+            <string>Desktop</string>
            </attribute>
-           <layout class="QVBoxLayout" name="verticalLayout_7">
-            <item>
-             <widget class="QListWidget" name="list_panel2_plugins">
-              <property name="iconSize">
-               <size>
-                <width>16</width>
-                <height>16</height>
-               </size>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_11">
+           <layout class="QGridLayout" name="gridLayout_4">
+            <item row="2" column="0">
+             <layout class="QHBoxLayout" name="horizontalLayout_13">
               <item>
-               <widget class="QToolButton" name="tool_panel2_addplugin">
+               <widget class="QToolButton" name="tool_menu_add">
                 <property name="text">
                  <string notr="true">add</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QToolButton" name="tool_panel2_rmplugin">
+               <widget class="QToolButton" name="tool_menu_rm">
                 <property name="text">
                  <string notr="true">rem</string>
                 </property>
                </widget>
               </item>
               <item>
-               <spacer name="horizontalSpacer_6">
+               <spacer name="horizontalSpacer_9">
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
                 </property>
-                <property name="sizeType">
-                 <enum>QSizePolicy::MinimumExpanding</enum>
-                </property>
                 <property name="sizeHint" stdset="0">
                  <size>
-                  <width>10</width>
+                  <width>40</width>
                   <height>20</height>
                  </size>
                 </property>
                </spacer>
               </item>
               <item>
-               <widget class="QToolButton" name="tool_panel2_upplug">
+               <widget class="QToolButton" name="tool_menu_up">
                 <property name="text">
                  <string notr="true">up</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QToolButton" name="tool_panel2_dnplug">
+               <widget class="QToolButton" name="tool_menu_dn">
                 <property name="text">
                  <string notr="true">dn</string>
                 </property>
@@ -546,235 +426,577 @@
               </item>
              </layout>
             </item>
-           </layout>
-          </widget>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <layout class="QHBoxLayout" name="horizontalLayout_9">
-          <item>
-           <widget class="QToolButton" name="tool_panel2_add">
-            <property name="text">
-             <string notr="true">add</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="tool_panel2_rm">
-            <property name="text">
-             <string notr="true">rem</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label_panel2">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>Panel #2</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="1" column="0">
-         <widget class="QToolBox" name="toolBox_panel1">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="frameShape">
-           <enum>QFrame::StyledPanel</enum>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
-          </property>
-          <property name="midLineWidth">
-           <number>2</number>
-          </property>
-          <property name="currentIndex">
-           <number>0</number>
-          </property>
-          <widget class="QWidget" name="page_panel1_appearance">
-           <property name="geometry">
-            <rect>
-             <x>0</x>
-             <y>0</y>
-             <width>263</width>
-             <height>187</height>
-            </rect>
-           </property>
-           <attribute name="label">
-            <string>Appearance</string>
-           </attribute>
-           <layout class="QFormLayout" name="formLayout">
-            <property name="fieldGrowthPolicy">
-             <enum>QFormLayout::ExpandingFieldsGrow</enum>
-            </property>
+            <item row="1" column="0">
+             <widget class="QListWidget" name="list_menu"/>
+            </item>
             <item row="0" column="0">
-             <widget class="QLabel" name="label_3">
+             <widget class="QLabel" name="label_10">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
               <property name="text">
-               <string>Location:</string>
+               <string>Quick-Access Menu</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
-             <widget class="QComboBox" name="combo_panel1_loc">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
+             <widget class="QLabel" name="label_15">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
               </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_4">
               <property name="text">
-               <string>Size:</string>
+               <string>Embedded Utilities</string>
               </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QSpinBox" name="spin_panel1_size"/>
-            </item>
-            <item row="4" column="0">
-             <widget class="QLabel" name="label_5">
-              <property name="text">
-               <string>Custom Color:</string>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
               </property>
              </widget>
             </item>
-            <item row="4" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_8">
+            <item row="1" column="1" rowspan="2">
+             <layout class="QVBoxLayout" name="verticalLayout_18">
               <item>
-               <widget class="QLabel" name="label_panel1_sample">
+               <layout class="QHBoxLayout" name="horizontalLayout_2">
+                <item>
+                 <spacer name="horizontalSpacer_7">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="push_addDesktopPlugin">
+                  <property name="text">
+                   <string>Add Utility to Screen</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_8">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_23">
                 <property name="sizePolicy">
-                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
-                <property name="frameShape">
-                 <enum>QFrame::StyledPanel</enum>
-                </property>
                 <property name="text">
-                 <string>Sample</string>
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Modifying or removing embedded utilities is performed from the desktop itself. Each screen may be individually unlocked (allowing modifications) from the quick-access menu.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="scaledContents">
+                 <bool>true</bool>
                 </property>
                 <property name="alignment">
-                 <set>Qt::AlignCenter</set>
+                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                </property>
+                <property name="wordWrap">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+          <widget class="QWidget" name="tab_panels">
+           <attribute name="title">
+            <string>Panels</string>
+           </attribute>
+           <layout class="QGridLayout" name="gridLayout_panels">
+            <item row="0" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_9">
+              <item>
+               <widget class="QToolButton" name="tool_panel2_add">
+                <property name="text">
+                 <string notr="true">add</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QToolButton" name="tool_panel2_rm">
+                <property name="text">
+                 <string notr="true">rem</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QToolButton" name="tool_panel1_getcolor">
+               <widget class="QLabel" name="label_panel2">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="font">
+                 <font>
+                  <weight>75</weight>
+                  <bold>true</bold>
+                 </font>
+                </property>
                 <property name="text">
-                 <string>...</string>
+                 <string>Panel #2</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
                 </property>
                </widget>
               </item>
              </layout>
             </item>
-            <item row="2" column="1">
-             <widget class="QCheckBox" name="check_panel1_hidepanel">
-              <property name="text">
-               <string>Auto-hide Panel </string>
+            <item row="1" column="0">
+             <widget class="QToolBox" name="toolBox_panel1">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
               </property>
-             </widget>
-            </item>
-            <item row="3" column="1">
-             <widget class="QCheckBox" name="check_panel1_usetheme">
-              <property name="text">
-               <string>Follow Theme</string>
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
               </property>
-              <property name="checked">
-               <bool>true</bool>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
+              </property>
+              <property name="midLineWidth">
+               <number>2</number>
+              </property>
+              <property name="currentIndex">
+               <number>0</number>
               </property>
+              <widget class="QWidget" name="page_panel1_appearance">
+               <property name="geometry">
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+                 <width>255</width>
+                 <height>160</height>
+                </rect>
+               </property>
+               <attribute name="label">
+                <string>Geometry</string>
+               </attribute>
+               <layout class="QFormLayout" name="formLayout">
+                <property name="fieldGrowthPolicy">
+                 <enum>QFormLayout::ExpandingFieldsGrow</enum>
+                </property>
+                <item row="0" column="0">
+                 <widget class="QLabel" name="label_3">
+                  <property name="text">
+                   <string>Location:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QComboBox" name="combo_panel1_loc">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="0">
+                 <widget class="QLabel" name="label_4">
+                  <property name="text">
+                   <string>Size:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="1">
+                 <widget class="QSpinBox" name="spin_panel1_size"/>
+                </item>
+                <item row="4" column="0">
+                 <widget class="QLabel" name="label_5">
+                  <property name="text">
+                   <string>Custom Color:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="4" column="1">
+                 <layout class="QHBoxLayout" name="horizontalLayout_8">
+                  <item>
+                   <widget class="QLabel" name="label_panel1_sample">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="frameShape">
+                     <enum>QFrame::StyledPanel</enum>
+                    </property>
+                    <property name="text">
+                     <string>Sample</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QToolButton" name="tool_panel1_getcolor">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item row="2" column="1">
+                 <widget class="QCheckBox" name="check_panel1_hidepanel">
+                  <property name="text">
+                   <string>Auto-hide Panel </string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="3" column="1">
+                 <widget class="QCheckBox" name="check_panel1_usetheme">
+                  <property name="text">
+                   <string>Follow Theme</string>
+                  </property>
+                  <property name="checked">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+              <widget class="QWidget" name="page_panel1_plugins">
+               <property name="geometry">
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+                 <width>274</width>
+                 <height>160</height>
+                </rect>
+               </property>
+               <attribute name="label">
+                <string>Plugins</string>
+               </attribute>
+               <layout class="QVBoxLayout" name="verticalLayout_5">
+                <item>
+                 <widget class="QListWidget" name="list_panel1_plugins">
+                  <property name="iconSize">
+                   <size>
+                    <width>16</width>
+                    <height>16</height>
+                   </size>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <layout class="QHBoxLayout" name="horizontalLayout_7">
+                  <item>
+                   <widget class="QToolButton" name="tool_panel1_addplugin">
+                    <property name="text">
+                     <string notr="true">add</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QToolButton" name="tool_panel1_rmplugin">
+                    <property name="text">
+                     <string notr="true">rem</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_5">
+                    <property name="orientation">
+                     <enum>Qt::Horizontal</enum>
+                    </property>
+                    <property name="sizeType">
+                     <enum>QSizePolicy::MinimumExpanding</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                     <size>
+                      <width>10</width>
+                      <height>20</height>
+                     </size>
+                    </property>
+                   </spacer>
+                  </item>
+                  <item>
+                   <widget class="QToolButton" name="tool_panel1_upplug">
+                    <property name="text">
+                     <string notr="true">up</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QToolButton" name="tool_panel1_dnplug">
+                    <property name="text">
+                     <string notr="true">dn</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+               </layout>
+              </widget>
              </widget>
             </item>
-           </layout>
-          </widget>
-          <widget class="QWidget" name="page_panel1_plugins">
-           <property name="geometry">
-            <rect>
-             <x>0</x>
-             <y>0</y>
-             <width>197</width>
-             <height>117</height>
-            </rect>
-           </property>
-           <attribute name="label">
-            <string>Plugins</string>
-           </attribute>
-           <layout class="QVBoxLayout" name="verticalLayout_5">
-            <item>
-             <widget class="QListWidget" name="list_panel1_plugins">
-              <property name="iconSize">
-               <size>
-                <width>16</width>
-                <height>16</height>
-               </size>
+            <item row="1" column="1">
+             <widget class="QToolBox" name="toolBox_panel2">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
+              </property>
+              <property name="lineWidth">
+               <number>1</number>
+              </property>
+              <property name="midLineWidth">
+               <number>2</number>
               </property>
+              <property name="currentIndex">
+               <number>0</number>
+              </property>
+              <widget class="QWidget" name="page_panel2_appearance">
+               <property name="geometry">
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+                 <width>254</width>
+                 <height>160</height>
+                </rect>
+               </property>
+               <attribute name="label">
+                <string>Geometry</string>
+               </attribute>
+               <layout class="QFormLayout" name="formLayout_2">
+                <property name="fieldGrowthPolicy">
+                 <enum>QFormLayout::ExpandingFieldsGrow</enum>
+                </property>
+                <item row="0" column="0">
+                 <widget class="QLabel" name="label_7">
+                  <property name="text">
+                   <string>Location:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QComboBox" name="combo_panel2_loc">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="0">
+                 <widget class="QLabel" name="label_8">
+                  <property name="text">
+                   <string>Size:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="1">
+                 <widget class="QSpinBox" name="spin_panel2_size"/>
+                </item>
+                <item row="4" column="0">
+                 <widget class="QLabel" name="label_9">
+                  <property name="text">
+                   <string>Custom Color:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="4" column="1">
+                 <layout class="QHBoxLayout" name="horizontalLayout_10">
+                  <item>
+                   <widget class="QLabel" name="label_panel2_sample">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="frameShape">
+                     <enum>QFrame::StyledPanel</enum>
+                    </property>
+                    <property name="text">
+                     <string>Sample</string>
+                    </property>
+                    <property name="alignment">
+                     <set>Qt::AlignCenter</set>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QToolButton" name="tool_panel2_getcolor">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item row="2" column="1">
+                 <widget class="QCheckBox" name="check_panel2_hidepanel">
+                  <property name="text">
+                   <string>Auto-hide Panel </string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="3" column="1">
+                 <widget class="QCheckBox" name="check_panel2_usetheme">
+                  <property name="text">
+                   <string>Follow Theme</string>
+                  </property>
+                  <property name="checked">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+              <widget class="QWidget" name="page_panel2_plugins">
+               <property name="geometry">
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+                 <width>274</width>
+                 <height>160</height>
+                </rect>
+               </property>
+               <attribute name="label">
+                <string>Plugins</string>
+               </attribute>
+               <layout class="QVBoxLayout" name="verticalLayout_7">
+                <item>
+                 <widget class="QListWidget" name="list_panel2_plugins">
+                  <property name="iconSize">
+                   <size>
+                    <width>16</width>
+                    <height>16</height>
+                   </size>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <layout class="QHBoxLayout" name="horizontalLayout_11">
+                  <item>
+                   <widget class="QToolButton" name="tool_panel2_addplugin">
+                    <property name="text">
+                     <string notr="true">add</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QToolButton" name="tool_panel2_rmplugin">
+                    <property name="text">
+                     <string notr="true">rem</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_6">
+                    <property name="orientation">
+                     <enum>Qt::Horizontal</enum>
+                    </property>
+                    <property name="sizeType">
+                     <enum>QSizePolicy::MinimumExpanding</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                     <size>
+                      <width>10</width>
+                      <height>20</height>
+                     </size>
+                    </property>
+                   </spacer>
+                  </item>
+                  <item>
+                   <widget class="QToolButton" name="tool_panel2_upplug">
+                    <property name="text">
+                     <string notr="true">up</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QToolButton" name="tool_panel2_dnplug">
+                    <property name="text">
+                     <string notr="true">dn</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+               </layout>
+              </widget>
              </widget>
             </item>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_7">
+            <item row="0" column="0">
+             <layout class="QHBoxLayout" name="horizontalLayout_6">
               <item>
-               <widget class="QToolButton" name="tool_panel1_addplugin">
+               <widget class="QToolButton" name="tool_panel1_add">
                 <property name="text">
                  <string notr="true">add</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QToolButton" name="tool_panel1_rmplugin">
+               <widget class="QToolButton" name="tool_panel1_rm">
                 <property name="text">
                  <string notr="true">rem</string>
                 </property>
                </widget>
               </item>
               <item>
-               <spacer name="horizontalSpacer_5">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeType">
-                 <enum>QSizePolicy::MinimumExpanding</enum>
+               <widget class="QLabel" name="label_panel1">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
                 </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>10</width>
-                  <height>20</height>
-                 </size>
+                <property name="font">
+                 <font>
+                  <weight>75</weight>
+                  <bold>true</bold>
+                 </font>
                 </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QToolButton" name="tool_panel1_upplug">
                 <property name="text">
-                 <string notr="true">up</string>
+                 <string>Panel #1</string>
                 </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="tool_panel1_dnplug">
-                <property name="text">
-                 <string notr="true">dn</string>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
                 </property>
                </widget>
               </item>
@@ -784,97 +1006,6 @@
           </widget>
          </widget>
         </item>
-        <item row="1" column="2">
-         <spacer name="verticalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>0</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="page_menu">
-       <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
-         <spacer name="horizontalSpacer_7">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>74</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="0" column="1">
-         <widget class="QListWidget" name="list_menu"/>
-        </item>
-        <item row="0" column="2">
-         <spacer name="horizontalSpacer_8">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>74</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="1" column="1">
-         <layout class="QHBoxLayout" name="horizontalLayout_13">
-          <item>
-           <widget class="QToolButton" name="tool_menu_add">
-            <property name="text">
-             <string notr="true">add</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="tool_menu_rm">
-            <property name="text">
-             <string notr="true">rem</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_9">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QToolButton" name="tool_menu_up">
-            <property name="text">
-             <string notr="true">up</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="tool_menu_dn">
-            <property name="text">
-             <string notr="true">dn</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
        </layout>
       </widget>
       <widget class="QWidget" name="page_shortcuts">
@@ -1226,115 +1357,8 @@
            <string/>
           </property>
           <property name="currentIndex">
-           <number>1</number>
+           <number>0</number>
           </property>
-          <widget class="QWidget" name="tab_theme">
-           <attribute name="title">
-            <string>Theme</string>
-           </attribute>
-           <layout class="QFormLayout" name="formLayout_3">
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_12">
-              <property name="text">
-               <string>Font:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QFontComboBox" name="font_session_theme">
-              <property name="editable">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_14">
-              <property name="text">
-               <string>Font Size:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QSpinBox" name="spin_session_fontsize">
-              <property name="suffix">
-               <string> point</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_16">
-              <property name="text">
-               <string>Theme Template:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_12">
-              <item>
-               <widget class="QComboBox" name="combo_session_themefile">
-                <property name="sizeAdjustPolicy">
-                 <enum>QComboBox::AdjustToContents</enum>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="tool_session_newtheme">
-                <property name="toolTip">
-                 <string>Create/Edit a theme template (Advanced)</string>
-                </property>
-                <property name="statusTip">
-                 <string/>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item row="3" column="0">
-             <widget class="QLabel" name="label_17">
-              <property name="text">
-               <string>Color Scheme:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_19">
-              <item>
-               <widget class="QComboBox" name="combo_session_colorfile">
-                <property name="sizeAdjustPolicy">
-                 <enum>QComboBox::AdjustToContents</enum>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QToolButton" name="tool_session_newcolor">
-                <property name="toolTip">
-                 <string>Create/Edit a color scheme</string>
-                </property>
-                <property name="statusTip">
-                 <string/>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item row="4" column="1">
-             <widget class="QComboBox" name="combo_session_icontheme"/>
-            </item>
-            <item row="4" column="0">
-             <widget class="QLabel" name="label_18">
-              <property name="text">
-               <string>Icon Pack:</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
           <widget class="QWidget" name="tab">
            <attribute name="title">
             <string>General Options</string>
@@ -1599,7 +1623,7 @@
                     <x>0</x>
                     <y>0</y>
                     <width>493</width>
-                    <height>70</height>
+                    <height>89</height>
                    </rect>
                   </property>
                   <property name="sizePolicy">
@@ -1746,7 +1770,6 @@
    </attribute>
    <addaction name="actionDesktop"/>
    <addaction name="actionPanels"/>
-   <addaction name="actionMenu"/>
    <addaction name="actionShortcuts"/>
    <addaction name="actionDefaults"/>
    <addaction name="actionSession"/>
@@ -1756,7 +1779,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Desktop</string>
+    <string>Appearance</string>
    </property>
    <property name="toolTip">
     <string>Desktop Appearance</string>
@@ -1767,10 +1790,10 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Panels</string>
+    <string>Interface</string>
    </property>
    <property name="toolTip">
-    <string>Panel Configuration</string>
+    <string>Interface Configuration</string>
    </property>
   </action>
   <action name="actionSession">
@@ -1806,17 +1829,6 @@
     <string>Keyboard Shortcuts</string>
    </property>
   </action>
-  <action name="actionMenu">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Menu</string>
-   </property>
-   <property name="toolTip">
-    <string>Desktop Menu</string>
-   </property>
-  </action>
  </widget>
  <resources/>
  <connections/>