Merge remote-tracking branch 'upstream/master'

16 files changed, 629 insertions, 979 deletions

diff --git a/src-qt5/core-utils/lumina-config/AppDialog.h b/src-qt5/core-utils/lumina-config/AppDialog.h
index ea7615e2..2b03fc76 100644
--- a/src-qt5/core-utils/lumina-config/AppDialog.h
+++ b/src-qt5/core-utils/lumina-config/AppDialog.h
@@ -23,13 +23,22 @@ private:
 	Ui::AppDialog *ui;
 
 public:
-	AppDialog(QWidget *parent = 0) : QDialog(parent), ui(new Ui::AppDialog){
+	AppDialog(QWidget *parent = 0, QString defaultPath = "") : QDialog(parent), ui(new Ui::AppDialog){
 	  ui->setupUi(this); //load the designer file
 	  appreset = false;
-	  ui->comboBox->clear();
+	  ui->listApps->clear();
+    QListWidgetItem *defaultItem = nullptr;
           QList<XDGDesktop*> APPS = LXDG::sortDesktopNames(APPSLIST->apps(false,false)); //Don't show all/hidden
 	  for(int i=0; i<APPS.length(); i++){
-	    ui->comboBox->addItem( LXDG::findIcon(APPS[i]->icon,"application-x-executable"), APPS[i]->name, APPS[i]->filePath);
+	    QListWidgetItem *app = new QListWidgetItem(LXDG::findIcon(APPS[i]->icon,"application-x-executable"), APPS[i]->name);
+	    app->setData(Qt::UserRole, APPS[i]->filePath);
+	    ui->listApps->addItem(app);
+      if(APPS[i]->filePath == defaultPath){
+        defaultItem = app;
+      }
+	  }
+	  if(ui->listApps->count()){
+	    ui->listApps->setCurrentItem(defaultItem != nullptr ? defaultItem : ui->listApps->item(0));
 	  }
 	  this->setWindowIcon( LXDG::findIcon("system-search","") );
 	  if(parent!=0){
@@ -56,7 +65,10 @@ public:
 		
 private slots:
 	void on_buttonBox_accepted(){
-	  appselected = ui->comboBox->currentData().toString();
+	  QListWidgetItem *item = ui->listApps->currentItem();
+	  if(item != nullptr){
+	    appselected = item->data(Qt::UserRole).toString();
+	  }
 	  this->close();
 	}
 	void on_buttonBox_rejected(){
@@ -68,6 +80,26 @@ private slots:
 	    this->close();
 	  }
 	}
+	void on_listApps_itemDoubleClicked(QListWidgetItem *item){
+	  appselected = item->data(Qt::UserRole).toString();
+	  this->close();
+	}
+	void on_lineSearch_textChanged(const QString &term){
+	  QListWidgetItem *first_visible = nullptr;
+	  for(int i = 0; i < ui->listApps->count(); i++){
+	    QListWidgetItem *item = ui->listApps->item(i);
+	    bool visible = item->text().contains(term, Qt::CaseInsensitive);
+	    item->setHidden(!visible);
+	    if(visible && first_visible == nullptr){
+	      first_visible = item;
+	    }
+	  }
+	  //Select the first app
+	  ui->listApps->setCurrentItem(first_visible);
+	  if(first_visible != nullptr){
+	    ui->listApps->scrollToItem(first_visible);
+	  }
+	}
 };
 
 #endif
diff --git a/src-qt5/core-utils/lumina-config/AppDialog.ui b/src-qt5/core-utils/lumina-config/AppDialog.ui
index 63323f7d..ec7de974 100644
--- a/src-qt5/core-utils/lumina-config/AppDialog.ui
+++ b/src-qt5/core-utils/lumina-config/AppDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>348</width>
-    <height>91</height>
+    <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,46 +15,14 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QComboBox" name="comboBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>32</width>
-       <height>32</height>
-      </size>
+    <widget class="QLineEdit" name="lineSearch">
+     <property name="placeholderText">
+      <string>Search for....</string>
      </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>
+    <widget class="QListWidget" name="listApps"/>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts
index a596d071..add87210 100644
--- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts
+++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts
@@ -14,7 +14,7 @@
     <message>
         <location filename="../ColorDialog.ui" line="14"/>
         <source>Color Scheme Editor</source>
-        <translation>Redigér Farveskema</translation>
+        <translation>Redigér farveskema</translation>
     </message>
     <message>
         <location filename="../ColorDialog.ui" line="28"/>
@@ -50,12 +50,12 @@
     <message>
         <location filename="../ColorDialog.ui" line="105"/>
         <source>Sample</source>
-        <translation>Eksempel</translation>
+        <translation>Prøve</translation>
     </message>
     <message>
         <location filename="../ColorDialog.ui" line="115"/>
         <source>Cancel</source>
-        <translation>Annullér</translation>
+        <translation>Annuller</translation>
     </message>
     <message>
         <location filename="../ColorDialog.ui" line="135"/>
@@ -71,8 +71,8 @@
         <location filename="../ColorDialog.cpp" line="98"/>
         <source>This color scheme already exists.
  Overwrite it?</source>
-        <translation>Denne farve eksisterer allerede. 
-Skal den overskrives?</translation>
+        <translation>Denne farve eksisterer allerede.
+ Skal den overskrives?</translation>
     </message>
     <message>
         <location filename="../ColorDialog.cpp" line="121"/>
@@ -96,17 +96,17 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../GetPluginDialog.ui" line="14"/>
         <source>Select Plugin</source>
-        <translation>Vælg Udvidelsesmodul</translation>
+        <translation>Vælg plugin</translation>
     </message>
     <message>
         <location filename="../GetPluginDialog.ui" line="26"/>
         <source>Select a Plugin:</source>
-        <translation>Vælg et Udvidelsesmodul:</translation>
+        <translation>Vælg et plugin:</translation>
     </message>
     <message>
         <location filename="../GetPluginDialog.ui" line="57"/>
         <source>Cancel</source>
-        <translation>Afbryd</translation>
+        <translation>Annuller</translation>
     </message>
     <message>
         <location filename="../GetPluginDialog.ui" line="77"/>
@@ -119,7 +119,7 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../PanelWidget.ui" line="32"/>
         <source>Form</source>
-        <translation>Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../PanelWidget.ui" line="93"/>
@@ -139,7 +139,7 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../PanelWidget.ui" line="138"/>
         <source> pixel(s) thick</source>
-        <translation>  pixel(s) tyk</translation>
+        <translation> pixel(s) bred</translation>
     </message>
     <message>
         <location filename="../PanelWidget.ui" line="157"/>
@@ -154,7 +154,7 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../PanelWidget.ui" line="204"/>
         <source>Appearance</source>
-        <translation type="unfinished">Udseende</translation>
+        <translation>Udseende</translation>
     </message>
     <message>
         <location filename="../PanelWidget.ui" line="222"/>
@@ -164,37 +164,37 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../PanelWidget.ui" line="229"/>
         <source>Use Custom Color</source>
-        <translation>Anvend brugervalgt farve</translation>
+        <translation>Brug brugerdefineret farve</translation>
     </message>
     <message>
         <location filename="../PanelWidget.ui" line="250"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../PanelWidget.ui" line="257"/>
         <source>Sample</source>
-        <translation type="unfinished">Eksempel</translation>
+        <translation>Prøve</translation>
     </message>
     <message>
         <location filename="../PanelWidget.ui" line="287"/>
         <source>Plugins</source>
-        <translation>Udvidelsesmoduler</translation>
+        <translation>Plugins</translation>
     </message>
     <message>
         <location filename="../PanelWidget.cpp" line="19"/>
         <source>Top/Left</source>
-        <translation>Øverst/Venstre</translation>
+        <translation>Øverst/venstre</translation>
     </message>
     <message>
         <location filename="../PanelWidget.cpp" line="20"/>
         <source>Center</source>
-        <translation>Midt</translation>
+        <translation>I midten</translation>
     </message>
     <message>
         <location filename="../PanelWidget.cpp" line="21"/>
         <source>Bottom/Right</source>
-        <translation>Bund/Højre</translation>
+        <translation>Nederst/højre</translation>
     </message>
     <message>
         <location filename="../PanelWidget.cpp" line="22"/>
@@ -204,29 +204,29 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../PanelWidget.cpp" line="23"/>
         <source>Bottom</source>
-        <translation>Bund</translation>
+        <translation>Nederst</translation>
     </message>
     <message>
         <location filename="../PanelWidget.cpp" line="24"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Venstre</translation>
     </message>
     <message>
         <location filename="../PanelWidget.cpp" line="25"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Højre</translation>
     </message>
     <message>
         <location filename="../PanelWidget.cpp" line="44"/>
         <location filename="../PanelWidget.cpp" line="117"/>
         <source>Panel %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Panel %1</translation>
     </message>
     <message>
         <location filename="../PanelWidget.cpp" line="155"/>
         <location filename="../PanelWidget.cpp" line="156"/>
         <source>Select Color</source>
-        <translation type="unfinished">Vælg farve</translation>
+        <translation>Vælg farve</translation>
     </message>
 </context>
 <context>
@@ -234,27 +234,27 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../LPlugins.cpp" line="80"/>
         <source>Desktop Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebordsbjælke</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="81"/>
         <source>This provides shortcuts to everything in the desktop folder - allowing easy access to all your favorite files/applications.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dette giver genveje til alt i skrivebordsmappen - hvilket giver nem adgang til alle dine favoritfiler/-programmer.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="87"/>
         <source>Spacer</source>
-        <translation type="unfinished"></translation>
+        <translation>Afstandsstykke</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="88"/>
         <source>Invisible spacer to separate plugins.</source>
-        <translation type="unfinished"></translation>
+        <translation>Usynlig afstandsstykke til at afskille plugins.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="102"/>
         <source>Controls for switching between the various virtual desktops.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontroller til at skifte mellem de forskellige virtuelle skriveborde.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="108"/>
@@ -269,579 +269,579 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../LPlugins.cpp" line="115"/>
         <source>Time/Date</source>
-        <translation>Tid/Dato</translation>
+        <translation>Klokkeslæt/dato</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="116"/>
         <source>View the current time and date.</source>
-        <translation>Vis det aktuelle tidspunkt og dato.</translation>
+        <translation>Vis det aktuelle klokkeslæt og dato.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="122"/>
         <source>System Dashboard</source>
-        <translation type="unfinished">Instrumentbræt til skrivebordet</translation>
+        <translation>Systemets instrumentbræt</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="123"/>
         <source>View or change system settings (audio volume, screen brightness, battery life, virtual desktops).</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis eller ændre systemindstillinger (lydstyrke, skærmlysstyrke, batteriliv, virtuelle skriveborde).</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="129"/>
         <location filename="../LPlugins.cpp" line="291"/>
         <source>Task Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Opgavehåndtering</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="136"/>
         <source>Task Manager (No Groups)</source>
-        <translation type="unfinished"></translation>
+        <translation>Opgavehåndtering (ingen grupper)</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="143"/>
         <source>System Tray</source>
-        <translation type="unfinished"></translation>
+        <translation>Systembakke</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="144"/>
         <source>Display area for dockable system applications</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis område til systemprogrammer som kan dokkes</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="151"/>
         <source>Hide all open windows and show the desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Skjul alle åbne vinduer og vis skrivebordet</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="157"/>
         <source>Start Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Startmenu</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="190"/>
         <source>Calendar</source>
-        <translation type="unfinished"></translation>
+        <translation>Kalender</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="191"/>
         <source>Display a calendar on the desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis en kalender på skrivebordet</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="164"/>
         <location filename="../LPlugins.cpp" line="197"/>
         <source>Application Launcher</source>
-        <translation type="unfinished"></translation>
+        <translation>Programstarter</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="66"/>
         <source>User Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Brugermenu</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="67"/>
-        <source>Start menu alternative focusing on the user&apos;s files, directories, and favorites.</source>
-        <translation type="unfinished"></translation>
+        <source>Start menu alternative focusing on the user's files, directories, and favorites.</source>
+        <translation>Startmenu alternativ som fokusere på brugerens filer, mapper og favoritter.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="73"/>
         <source>Application Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Programmenu</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="74"/>
         <source>Start menu alternative which focuses on launching applications.</source>
-        <translation type="unfinished"></translation>
+        <translation>Startmenu alternativ som fokusere på startende programmer.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="94"/>
         <source>Line</source>
-        <translation type="unfinished"></translation>
+        <translation>Linje</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="95"/>
         <source>Simple line to provide visual separation between items.</source>
-        <translation type="unfinished"></translation>
+        <translation>Simpel linje til at give visuel adskillelse mellem poster.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="101"/>
         <source>Workspace Switcher</source>
-        <translation type="unfinished"></translation>
+        <translation>Arbejdsområdeskifter</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="130"/>
         <source>View and control any running application windows (group similar windows under a single button).</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis og kontrollér kørende programvinder (gruppér lignende vinduer under en enkelt knap).</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="137"/>
         <source>View and control any running application windows (every individual window has a button)</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis og kontrollér kørende programvinder (hvert vindue har en knap)</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="150"/>
         <source>Show Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis skrivebord</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="158"/>
         <source>Unified system access and application launch menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ensartet systemadgang og programstart-menu.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="165"/>
         <source>Pin an application shortcut directly to the panel</source>
-        <translation type="unfinished"></translation>
+        <translation>Fastgør en programgenvej direkte til panalet</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="198"/>
         <source>Desktop button for launching an application</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebordsknap til at starte et program</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="204"/>
         <source>Desktop Icons View</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebordsikonvisning</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="211"/>
         <source>Note Pad</source>
-        <translation type="unfinished"></translation>
+        <translation>Notesblok</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="212"/>
         <source>Keep simple text notes on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Hold simple tekstnoter på dit skrivebord</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="171"/>
         <location filename="../LPlugins.cpp" line="218"/>
         <source>Audio Player</source>
-        <translation type="unfinished"></translation>
+        <translation>Lydafspiller</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="172"/>
         <location filename="../LPlugins.cpp" line="219"/>
         <source>Play through lists of audio files</source>
-        <translation type="unfinished"></translation>
+        <translation>Afspil gennem listen af lydfiler</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="225"/>
         <source>System Monitor</source>
-        <translation type="unfinished"></translation>
+        <translation>Systemovervågning</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="226"/>
         <source>Keep track of system statistics such as CPU/Memory usage and CPU temperatures.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hold styr på systemstatisk såsom CPU/hukommelsesforbrug og CPU-temperaturer.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="232"/>
         <source>RSS Reader</source>
-        <translation type="unfinished"></translation>
+        <translation>RSS-læser</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="233"/>
         <source>Monitor RSS Feeds (Requires internet connection)</source>
-        <translation type="unfinished"></translation>
+        <translation>Overvåg RSS-feeds (kræver internetforbindelse)</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="256"/>
         <source>Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminal</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="257"/>
         <source>Start the default system terminal.</source>
-        <translation type="unfinished"></translation>
+        <translation>Start standardsystemterminalen.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="264"/>
         <source>Browse the system with the default file manager.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gennemse systemet med standardfilhåndteringen.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="270"/>
         <location filename="../pages/getPage.h" line="33"/>
         <source>Applications</source>
-        <translation type="unfinished"></translation>
+        <translation>Programmer</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="271"/>
         <source>Show the system applications menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis systemets programmenu.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="277"/>
         <source>Separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Separator</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="278"/>
         <source>Static horizontal line.</source>
-        <translation type="unfinished"></translation>
+        <translation>Statisk vandret linje.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="285"/>
         <source>Show the desktop settings menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis skrivebordsindstillinger-menuen.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="298"/>
         <source>Custom App</source>
-        <translation type="unfinished"></translation>
+        <translation>Brugerdefineret program</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="299"/>
         <source>Start a custom application</source>
-        <translation type="unfinished"></translation>
+        <translation>Start et brugerdefineret program</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="178"/>
         <location filename="../LPlugins.cpp" line="305"/>
         <source>Menu Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu-script</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="205"/>
         <source>Configurable area for automatically showing desktop icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurerbart område til automatisk visning af skrivebordsikoner</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="263"/>
         <source>Browse Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Gennemse filer</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="284"/>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>Præferencer</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="292"/>
         <source>List the open, minimized, active, and urgent application windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis de åbne, minimerede, aktive og vigtige programvinduer</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="179"/>
         <location filename="../LPlugins.cpp" line="306"/>
         <source>Run an external script to generate a user defined menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Kør et eksternt script til generering af en brugerdefineret menu</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="312"/>
         <source>Lock Session</source>
-        <translation type="unfinished"></translation>
+        <translation>Lås session</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="313"/>
         <source>Lock the current desktop session</source>
-        <translation type="unfinished"></translation>
+        <translation>Lås den aktuelle skrivebordssession</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="323"/>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="324"/>
         <source>Color to use for all visible text.</source>
-        <translation type="unfinished"></translation>
+        <translation>Farve som skal bruges til al synlig tekst.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="329"/>
         <source>Text (Disabled)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst (deaktiveret)</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="330"/>
         <source>Text color for disabled or inactive items.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekstfarve til deaktiverede eller inaktive poster.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="335"/>
         <source>Text (Highlighted)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst (fremhævet)</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="336"/>
         <source>Text color when selection is highlighted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekstfarve til når markering er fremhævet.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="341"/>
         <source>Base Window Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Basis vinduesfarve</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="342"/>
         <source>Main background color for the window/dialog.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hovedbaggrundsfarve til vinduet/dialogen.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="347"/>
         <source>Base Window Color (Alternate)</source>
-        <translation type="unfinished"></translation>
+        <translation>Basis vinduesfarve (alternativ)</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="348"/>
         <source>Main background color for widgets that list or display collections of items.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hovedbaggrundsfarve til widgets som lister eller viser samlinger af poster.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="353"/>
         <source>Primary Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Primær farve</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="354"/>
         <source>Dominant color for the theme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dominerende farve til temaet.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="359"/>
         <source>Primary Color (Disabled)</source>
-        <translation type="unfinished"></translation>
+        <translation>Primær farve (deaktiveret)</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="360"/>
         <source>Dominant color for the theme (more subdued).</source>
-        <translation type="unfinished"></translation>
+        <translation>Dominerende farve til temaet (mere afdæmpet).</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="365"/>
         <source>Secondary Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Sekundfær farve</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="366"/>
         <source>Alternate color for the theme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alternativ farve til temaet.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="371"/>
         <source>Secondary Color (Disabled)</source>
-        <translation type="unfinished"></translation>
+        <translation>Sekundær farve (deaktiveret)</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="372"/>
         <source>Alternate color for the theme (more subdued).</source>
-        <translation type="unfinished"></translation>
+        <translation>Alternativ farve til temaet (mere afdæmpet).</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="377"/>
         <source>Accent Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Accentfarve</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="378"/>
         <source>Color used for borders or other accents.</source>
-        <translation type="unfinished"></translation>
+        <translation>Farve som bruges til kanter og andre accenter.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="383"/>
         <source>Accent Color (Disabled)</source>
-        <translation type="unfinished"></translation>
+        <translation>Accentfarve (deaktiveret)</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="384"/>
         <source>Color used for borders or other accents (more subdued).</source>
-        <translation type="unfinished"></translation>
+        <translation>Farve som bruges til kanter og andre accents (mere afdæmpet).</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="389"/>
         <source>Highlight Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Fremhævningsfarve</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="390"/>
         <source>Color used for highlighting an item.</source>
-        <translation type="unfinished"></translation>
+        <translation>Farve som skal bruges til fremhævning af en post.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="395"/>
         <source>Highlight Color (Disabled)</source>
-        <translation type="unfinished"></translation>
+        <translation>Fremhævningsfarve (deaktiveret)</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="396"/>
         <source>Color used for highlighting an item (more subdued).</source>
-        <translation type="unfinished"></translation>
+        <translation>Farve som skal bruges til fremhævning af post (mere afdæmpet).</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="29"/>
         <source>Wallpaper Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Tapetindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="29"/>
         <source>Change background image(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift baggrundsbillede(r)</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="30"/>
         <source>Theme Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Temaindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="30"/>
         <source>Change interface fonts and colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift brugerfladens skifttyper og farver</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="31"/>
         <source>Window Effects</source>
-        <translation type="unfinished"></translation>
+        <translation>Vindueseffekter</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="31"/>
         <source>Adjust transparency levels and window effects</source>
-        <translation type="unfinished"></translation>
+        <translation>Juster transparensniveauer og vindueseffekter</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="32"/>
         <source>Startup Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Opstartsindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="32"/>
         <source>Automatically start applications or services</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisk start af programmer eller tjenester</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="29"/>
         <source>Wallpaper</source>
-        <translation type="unfinished"></translation>
+        <translation>Tapet</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="30"/>
         <source>Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Tema</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="32"/>
         <source>Autostart</source>
-        <translation type="unfinished"></translation>
+        <translation>Autostart</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="33"/>
         <source>Mimetype Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>MIME-type-indstillinger</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="33"/>
         <source>Change default applications</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift standardprogrammer</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="34"/>
         <source>Keyboard Shortcuts</source>
-        <translation type="unfinished">Tastaturgenveje</translation>
+        <translation>Tastaturgenveje</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="34"/>
         <source>Change keyboard shortcuts</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift tastaturgenveje</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="35"/>
         <source>Window Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Vindueshåndtering</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="35"/>
         <source>Window Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Vinduesindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="35"/>
         <source>Change window settings and appearances</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift vinduesindstillinger og udseende</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="36"/>
         <source>Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebord</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="37"/>
         <source>Panels</source>
-        <translation type="unfinished"></translation>
+        <translation>Paneler</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="38"/>
         <source>Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="42"/>
         <source>Input Device Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Inputenhedsindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="42"/>
         <source>Adjust keyboard and mouse devices</source>
-        <translation type="unfinished"></translation>
+        <translation>Juster tastatur- og museenheder</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="36"/>
         <source>Desktop Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebord-plugins</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="36"/>
         <source>Change what icons or tools are embedded on the desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift hvilke ikoner og værktøjer som er indlejret på skrivebordet</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="37"/>
         <source>Panels and Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation>Paneler og plugins</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="37"/>
         <source>Change any floating panels and what they show</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift flydende paneler og hvad de viser</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="38"/>
         <source>Menu Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu-plugins</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="38"/>
         <source>Change what options are shown on the desktop context menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift hvilke valgmuligheder som vises i skrivebordets genvejsmenu</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="39"/>
         <source>Locale Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokale indstillinger</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="39"/>
         <source>Change the default locale settings for this user</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift standard lokale indstillinger for denne bruger</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="39"/>
         <source>Localization</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokalisering</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="40"/>
         <source>General Options</source>
-        <translation type="unfinished">Generelle Instillinger</translation>
+        <translation>Generelle instillinger</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="40"/>
         <source>User Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Brugerindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="40"/>
         <source>Change basic user settings such as time/date formats</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift grundlæggende brugerindstillinger såsom klokkeslæt-/datoformater</translation>
     </message>
 </context>
 <context>
@@ -849,48 +849,48 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../ScriptDialog.ui" line="14"/>
         <source>Setup a JSON Menu Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Opsæt et JSON-menu-script</translation>
     </message>
     <message>
         <location filename="../ScriptDialog.ui" line="25"/>
         <source>Visible Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Synligt navn:</translation>
     </message>
     <message>
         <location filename="../ScriptDialog.ui" line="32"/>
         <source>Executable:</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksekverbar:</translation>
     </message>
     <message>
         <location filename="../ScriptDialog.ui" line="39"/>
         <source>Icon:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ikon:</translation>
     </message>
     <message>
         <location filename="../ScriptDialog.ui" line="54"/>
         <location filename="../ScriptDialog.ui" line="87"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../ScriptDialog.ui" line="126"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Annuller</translation>
     </message>
     <message>
         <location filename="../ScriptDialog.ui" line="133"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>Anvend</translation>
     </message>
     <message>
         <location filename="../ScriptDialog.cpp" line="57"/>
         <source>Select a menu script</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg et menu-script</translation>
     </message>
     <message>
         <location filename="../ScriptDialog.cpp" line="64"/>
         <source>Select an icon file</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg en ikonfil</translation>
     </message>
 </context>
 <context>
@@ -898,45 +898,46 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../ThemeDialog.ui" line="14"/>
         <source>Theme Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Temaredigering</translation>
     </message>
     <message>
         <location filename="../ThemeDialog.ui" line="28"/>
         <source>Theme Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Temanavn:</translation>
     </message>
     <message>
         <location filename="../ThemeDialog.ui" line="51"/>
         <source>color</source>
-        <translation type="unfinished"></translation>
+        <translation>farve</translation>
     </message>
     <message>
         <location filename="../ThemeDialog.ui" line="74"/>
         <source>Cancel</source>
-        <translation type="unfinished">Annullér</translation>
+        <translation>Annuller</translation>
     </message>
     <message>
         <location filename="../ThemeDialog.ui" line="94"/>
         <source>Save</source>
-        <translation type="unfinished">Gem</translation>
+        <translation>Gem</translation>
     </message>
     <message>
         <location filename="../ThemeDialog.ui" line="101"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>Anvend</translation>
     </message>
     <message>
         <location filename="../ThemeDialog.cpp" line="65"/>
         <location filename="../ThemeDialog.cpp" line="82"/>
         <source>Theme Exists</source>
-        <translation type="unfinished"></translation>
+        <translation>Tema findes</translation>
     </message>
     <message>
         <location filename="../ThemeDialog.cpp" line="65"/>
         <location filename="../ThemeDialog.cpp" line="82"/>
         <source>This theme already exists.
  Overwrite it?</source>
-        <translation type="unfinished"></translation>
+        <translation>Dette tema findes allerede.
+ Overskriv det?</translation>
     </message>
 </context>
 <context>
@@ -944,54 +945,54 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../mainWindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
+        <translation>Hovedvindue</translation>
     </message>
     <message>
         <location filename="../mainWindow.ui" line="23"/>
         <source>toolBar</source>
-        <translation type="unfinished">Værktøjslinje</translation>
+        <translation>værktøjsbjælke</translation>
     </message>
     <message>
         <location filename="../mainWindow.ui" line="50"/>
         <source>Save</source>
-        <translation type="unfinished">Gem</translation>
+        <translation>Gem</translation>
     </message>
     <message>
         <location filename="../mainWindow.ui" line="53"/>
         <source>Save current changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Gem aktuelle ændringer</translation>
     </message>
     <message>
         <location filename="../mainWindow.ui" line="56"/>
         <source>Ctrl+S</source>
-        <translation type="unfinished">Ctrl+S</translation>
+        <translation>Ctrl+S</translation>
     </message>
     <message>
         <location filename="../mainWindow.ui" line="61"/>
         <source>Back to settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Tilbage til indstillinger</translation>
     </message>
     <message>
         <location filename="../mainWindow.ui" line="64"/>
         <location filename="../mainWindow.ui" line="67"/>
         <source>Back to overall settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Tilbage til overordnet indstillinger</translation>
     </message>
     <message>
         <location filename="../mainWindow.ui" line="78"/>
         <location filename="../mainWindow.ui" line="81"/>
         <source>Select monitor/desktop to configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg skærm/skrivebord som skal konfigureres</translation>
     </message>
     <message>
         <location filename="../mainWindow.cpp" line="129"/>
         <source>Unsaved Changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ugemte ændringer</translation>
     </message>
     <message>
         <location filename="../mainWindow.cpp" line="129"/>
         <source>This page currently has unsaved changes, do you wish to save them now?</source>
-        <translation type="unfinished"></translation>
+        <translation>Denne side har ugemte ændringer. Vil du gemme dem nu?</translation>
     </message>
 </context>
 <context>
@@ -999,62 +1000,62 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_autostart.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_autostart.ui" line="39"/>
         <source>Add New Startup Service</source>
-        <translation type="unfinished"></translation>
+        <translation>Tilføj ny opstartstjeneste</translation>
     </message>
     <message>
         <location filename="../pages/page_autostart.ui" line="75"/>
         <source>Application</source>
-        <translation type="unfinished">Program</translation>
+        <translation>Program</translation>
     </message>
     <message>
         <location filename="../pages/page_autostart.ui" line="85"/>
         <source>Binary</source>
-        <translation type="unfinished">Binær</translation>
+        <translation>Binær</translation>
     </message>
     <message>
         <location filename="../pages/page_autostart.ui" line="95"/>
         <source>File</source>
-        <translation type="unfinished">Fil</translation>
+        <translation>Fil</translation>
     </message>
     <message>
         <location filename="../pages/page_autostart.cpp" line="67"/>
         <source>Startup Services</source>
-        <translation type="unfinished"></translation>
+        <translation>Opstartstjenester</translation>
     </message>
     <message>
         <location filename="../pages/page_autostart.cpp" line="134"/>
         <source>Select Binary</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg binær</translation>
     </message>
     <message>
         <location filename="../pages/page_autostart.cpp" line="134"/>
         <source>Application Binaries (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Programbinærer (*)</translation>
     </message>
     <message>
         <location filename="../pages/page_autostart.cpp" line="137"/>
         <source>Invalid Binary</source>
-        <translation type="unfinished"></translation>
+        <translation>Ugyldig binær</translation>
     </message>
     <message>
         <location filename="../pages/page_autostart.cpp" line="137"/>
         <source>The selected file is not executable!</source>
-        <translation type="unfinished"></translation>
+        <translation>Den valgte fil er ikke eksekverbar!</translation>
     </message>
     <message>
         <location filename="../pages/page_autostart.cpp" line="151"/>
         <source>Select File</source>
-        <translation type="unfinished">Vælg fil</translation>
+        <translation>Vælg fil</translation>
     </message>
     <message>
         <location filename="../pages/page_autostart.cpp" line="151"/>
         <source>All Files (*)</source>
-        <translation type="unfinished">Alle filer (*)</translation>
+        <translation>Alle filer (*)</translation>
     </message>
 </context>
 <context>
@@ -1062,22 +1063,22 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_compton.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_compton.ui" line="32"/>
         <source>Disable Compositing Manager (session restart required)</source>
-        <translation type="unfinished"></translation>
+        <translation>Deaktivér kompositingshåndtering (kræver genstart af session)</translation>
     </message>
     <message>
         <location filename="../pages/page_compton.ui" line="39"/>
         <source>Only use compositing with GPU acceleration </source>
-        <translation type="unfinished"></translation>
+        <translation>Brug kun komposition med GPU-acceleration </translation>
     </message>
     <message>
         <location filename="../pages/page_compton.cpp" line="38"/>
         <source>Compositor Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Kompositorindstillinger</translation>
     </message>
 </context>
 <context>
@@ -1085,83 +1086,83 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="166"/>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Avanceret</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="189"/>
         <source>Specific File Types</source>
-        <translation type="unfinished">Specifikke Filtyper</translation>
+        <translation>Specifikke filtyper</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="226"/>
         <source>Type/Group</source>
-        <translation type="unfinished">Type/Gruppe</translation>
+        <translation>Type/gruppe</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="231"/>
         <source>Default Application</source>
-        <translation type="unfinished">Standardprogram</translation>
+        <translation>Standardprogram</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="236"/>
         <source>Description</source>
-        <translation type="unfinished">Beskrivelse</translation>
+        <translation>Beskrivelse</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="246"/>
         <source>Clear</source>
-        <translation type="unfinished">Ryd</translation>
+        <translation>Ryd</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="269"/>
         <source>Set App</source>
-        <translation type="unfinished">Sæt Prog</translation>
+        <translation>Sæt program</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="279"/>
         <source>Set Binary</source>
-        <translation type="unfinished"></translation>
+        <translation>Sæt binær</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="39"/>
         <source>Basic Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Basisindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="58"/>
         <source>Web Browser:</source>
-        <translation type="unfinished">Webbrowser:</translation>
+        <translation>Webbrowser:</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="81"/>
         <source>E-Mail Client:</source>
-        <translation type="unfinished">E-post Klient:</translation>
+        <translation>E-mailklient:</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="108"/>
         <source>File Manager:</source>
-        <translation type="unfinished">Filhåndtering:</translation>
+        <translation>Filhåndtering:</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="121"/>
         <source>Virtual Terminal:</source>
-        <translation type="unfinished">Virtuel Terminal:</translation>
+        <translation>Virtuel terminal:</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.ui" line="128"/>
         <location filename="../pages/page_defaultapps.ui" line="138"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.cpp" line="43"/>
         <source>Default Applications</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardprogrammer</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.cpp" line="61"/>
@@ -1170,27 +1171,27 @@ Skal den overskrives?</translation>
         <location filename="../pages/page_defaultapps.cpp" line="124"/>
         <location filename="../pages/page_defaultapps.cpp" line="220"/>
         <source>Click to Set</source>
-        <translation type="unfinished">Klik for at vælge</translation>
+        <translation>Klik for at sætte</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.cpp" line="158"/>
         <source>%1 (%2)</source>
-        <translation type="unfinished">%1 (%2)</translation>
+        <translation>%1 (%2)</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.cpp" line="330"/>
         <source>Select Binary</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg binær</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.cpp" line="337"/>
         <source>Invalid Binary</source>
-        <translation type="unfinished"></translation>
+        <translation>Ugyldig binær</translation>
     </message>
     <message>
         <location filename="../pages/page_defaultapps.cpp" line="337"/>
         <source>The selected binary is not executable!</source>
-        <translation type="unfinished"></translation>
+        <translation>Den valgte binær er ikke eksekverbar!</translation>
     </message>
 </context>
 <context>
@@ -1198,99 +1199,101 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="14"/>
         <source>page_fluxbox_keys</source>
-        <translation type="unfinished"></translation>
+        <translation>page_fluxbox_keys</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="34"/>
         <source>Basic Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Basisredigering</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="44"/>
         <source>Advanced Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Avanceret redigering</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="107"/>
         <source>Action</source>
-        <translation type="unfinished">Handling</translation>
+        <translation>Handling</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="112"/>
         <source>Keyboard Shortcut</source>
-        <translation type="unfinished">Tastaturgenvej</translation>
+        <translation>Tastaturgenvej</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="120"/>
         <source>Modify Shortcut</source>
-        <translation type="unfinished">Redigér genvej</translation>
+        <translation>Rediger genvej</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="141"/>
         <source>Clear Shortcut</source>
-        <translation type="unfinished">Fjern genvej</translation>
+        <translation>Ryd genvej</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="151"/>
         <source>Apply Change</source>
-        <translation type="unfinished">Udfør ændring</translation>
+        <translation>Anvend ændring</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="161"/>
         <source>Change Key Binding:</source>
-        <translation type="unfinished">Skift taste binding:</translation>
+        <translation>Skift tastebinding:</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="184"/>
         <source>Note: Current key bindings need to be cleared and saved before they can be re-used.</source>
-        <translation type="unfinished">Besked: Eksisterende taste genvej skal fjernes og gemmes før de kan blive genbrugt.</translation>
+        <translation>Bemærk: Eksisterende tastegenveje skal ryddes og gemmes inden de kan genbruges.</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="220"/>
         <source>View Syntax Codes</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis syntakskoder</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="244"/>
-        <source>&quot;Mod1&quot;:	Alt key
-&quot;Mod4&quot;: 	Windows/Mac key
-&quot;Control&quot;:	Ctrl key</source>
-        <translation type="unfinished"></translation>
+        <source>"Mod1":	Alt key
+"Mod4": 	Windows/Mac key
+"Control":	Ctrl key</source>
+        <translation>"Mod1":	Alt-tast
+"Mod4": 	Windows-/Mac-tast
+"Control":	Ctrl-tast</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.cpp" line="71"/>
         <source>Keyboard Shortcuts</source>
-        <translation type="unfinished">Tastaturgenveje</translation>
+        <translation>Tastaturgenveje</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.cpp" line="79"/>
         <source>Audio Volume Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Lydstyrke op</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.cpp" line="80"/>
         <source>Audio Volume Down</source>
-        <translation type="unfinished">Lydstyrke Ned</translation>
+        <translation>Lydstyrke ned</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.cpp" line="81"/>
         <source>Screen Brightness Up</source>
-        <translation type="unfinished">Skærmlysstyrke Op</translation>
+        <translation>Skærmlysstyrke op</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.cpp" line="82"/>
         <source>Screen Brightness Down</source>
-        <translation type="unfinished">Skærmlysstyrke Ned</translation>
+        <translation>Skærmlysstyrke ned</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.cpp" line="83"/>
         <source>Take Screenshot</source>
-        <translation type="unfinished">Tag skærmbillede</translation>
+        <translation>Tag skærmbillede</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.cpp" line="84"/>
         <source>Lock Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Lås session</translation>
     </message>
 </context>
 <context>
@@ -1298,88 +1301,88 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_fluxbox_settings.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.ui" line="34"/>
         <source>Simple Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Enkel redigering</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.ui" line="44"/>
         <source>Advanced Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Avanceret redigering</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.ui" line="81"/>
         <source>Number of Workspaces</source>
-        <translation type="unfinished">Antal af arbejdsområder</translation>
+        <translation>Antal arbejdsområder</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.ui" line="98"/>
         <source>New Window Placement</source>
-        <translation type="unfinished">Ny vinduesplacering</translation>
+        <translation>Ny vinduesplacering</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.ui" line="108"/>
         <source>Focus Policy</source>
-        <translation type="unfinished">Fokuspolitik</translation>
+        <translation>Fokuspolitik</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.ui" line="118"/>
         <source>Window Theme</source>
-        <translation type="unfinished">Vinduestema</translation>
+        <translation>Vinduestema</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.ui" line="136"/>
         <source>Window Theme Preview</source>
-        <translation type="unfinished">Vinduestema forhåndsvisning</translation>
+        <translation>Forhåndsvisning af vinduestema</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.ui" line="190"/>
         <location filename="../pages/page_fluxbox_settings.cpp" line="182"/>
         <source>No Preview Available</source>
-        <translation type="unfinished">Ingen forhåndsvisning tilgængelig</translation>
+        <translation>Ingen forhåndsvisning tilgængelig</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.cpp" line="71"/>
         <source>Window Manager Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Vindueshåndteringsindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.cpp" line="76"/>
         <source>Click To Focus</source>
-        <translation type="unfinished">Klik for fokus</translation>
+        <translation>Klik for at fokusere</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.cpp" line="77"/>
         <source>Active Mouse Focus</source>
-        <translation type="unfinished">Aktiv mus fokus</translation>
+        <translation>Aktiv musefokus</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.cpp" line="78"/>
         <source>Strict Mouse Focus</source>
-        <translation type="unfinished">Streng mus fokus</translation>
+        <translation>Streng musefokus</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.cpp" line="81"/>
         <source>Align in a Row</source>
-        <translation type="unfinished">Tilpas i en række</translation>
+        <translation>Sæt på række</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.cpp" line="82"/>
         <source>Align in a Column</source>
-        <translation type="unfinished">Tilpas i en kolonne</translation>
+        <translation>Sæt på kolonne</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.cpp" line="83"/>
         <source>Cascade</source>
-        <translation type="unfinished">Kaskade</translation>
+        <translation>Kaskade</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_settings.cpp" line="84"/>
         <source>Underneath Mouse</source>
-        <translation type="unfinished">Under mus</translation>
+        <translation>Under mus</translation>
     </message>
 </context>
 <context>
@@ -1387,22 +1390,22 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_interface_desktop.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_desktop.ui" line="26"/>
         <source>Embedded Utilities</source>
-        <translation type="unfinished"></translation>
+        <translation>Indlejrede redskaber</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_desktop.ui" line="77"/>
         <source>Display Desktop Folder Contents</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis skrivebordsmappens indhold</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_desktop.cpp" line="55"/>
         <source>Desktop Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebordsindstillinger</translation>
     </message>
 </context>
 <context>
@@ -1410,17 +1413,17 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_interface_menu.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_menu.ui" line="38"/>
         <source>Context Menu Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation>Genvejsmenu-plugins</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_menu.cpp" line="47"/>
         <source>Desktop Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebordsindstillinger</translation>
     </message>
 </context>
 <context>
@@ -1428,22 +1431,22 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_interface_panels.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_panels.ui" line="69"/>
         <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_panels.ui" line="82"/>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation>Importér</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_panels.cpp" line="52"/>
         <source>Desktop Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebordsindstillinger</translation>
     </message>
 </context>
 <context>
@@ -1451,37 +1454,37 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_main.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_main.ui" line="32"/>
         <source>Search for....</source>
-        <translation type="unfinished"></translation>
+        <translation>Søg efter....</translation>
     </message>
     <message>
         <location filename="../pages/page_main.cpp" line="53"/>
         <source>Interface Configuration</source>
-        <translation type="unfinished">Indstilling af grænseflade</translation>
+        <translation>Brugerfladekonfiguration</translation>
     </message>
     <message>
         <location filename="../pages/page_main.cpp" line="57"/>
         <source>Appearance</source>
-        <translation type="unfinished">Udseende</translation>
+        <translation>Udseende</translation>
     </message>
     <message>
         <location filename="../pages/page_main.cpp" line="61"/>
         <source>Desktop Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebordsstandarder</translation>
     </message>
     <message>
         <location filename="../pages/page_main.cpp" line="65"/>
         <source>User Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Brugerindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/page_main.cpp" line="131"/>
         <source>Desktop Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebordsindstillinger</translation>
     </message>
 </context>
 <context>
@@ -1489,32 +1492,32 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_mouse.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="53"/>
         <source>Input Device Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Inputenhedsindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="81"/>
         <source>Mouse #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Mus nummer %1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="85"/>
         <source>Keyboard #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Tastatur nummer %1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="106"/>
         <source>Extension Device #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Udvidelsesenhed nummer %1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="107"/>
         <source>Master Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Master-enhed</translation>
     </message>
 </context>
 <context>
@@ -1522,57 +1525,57 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_session_locale.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_session_locale.ui" line="32"/>
         <source>System localization settings (restart required)</source>
-        <translation type="unfinished"></translation>
+        <translation>System lokaliseringsindstillinger (kræver genstart)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_locale.ui" line="39"/>
         <source>Language</source>
-        <translation type="unfinished">Sprog</translation>
+        <translation>Sprog</translation>
     </message>
     <message>
         <location filename="../pages/page_session_locale.ui" line="49"/>
         <source>Messages</source>
-        <translation type="unfinished">Beskeder</translation>
+        <translation>Meddelelser</translation>
     </message>
     <message>
         <location filename="../pages/page_session_locale.ui" line="59"/>
         <source>Time</source>
-        <translation type="unfinished">Tid</translation>
+        <translation>Klokkeslæt</translation>
     </message>
     <message>
         <location filename="../pages/page_session_locale.ui" line="69"/>
         <source>Numeric</source>
-        <translation type="unfinished">Numerisk</translation>
+        <translation>Numerisk</translation>
     </message>
     <message>
         <location filename="../pages/page_session_locale.ui" line="79"/>
         <source>Monetary</source>
-        <translation type="unfinished">Monetære</translation>
+        <translation>Monetære</translation>
     </message>
     <message>
         <location filename="../pages/page_session_locale.ui" line="89"/>
         <source>Collate</source>
-        <translation type="unfinished">Saml</translation>
+        <translation>Saml</translation>
     </message>
     <message>
         <location filename="../pages/page_session_locale.ui" line="99"/>
         <source>CType</source>
-        <translation type="unfinished"></translation>
+        <translation>CType</translation>
     </message>
     <message>
         <location filename="../pages/page_session_locale.cpp" line="48"/>
         <source>Desktop Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebordsindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/page_session_locale.cpp" line="92"/>
         <source>System Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Systemstandard</translation>
     </message>
 </context>
 <context>
@@ -1580,244 +1583,244 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_session_options.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="34"/>
         <source>Enable numlock on startup</source>
-        <translation type="unfinished">Aktivér numlock under opstart</translation>
+        <translation>Aktivér numlock under opstart</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="41"/>
         <source>Play chimes on startup</source>
-        <translation type="unfinished">Afspil lyde under opstart</translation>
+        <translation>Afspil lyde under opstart</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="48"/>
         <source>Play chimes on exit</source>
-        <translation type="unfinished">Afspil lyde under afslutning</translation>
+        <translation>Afspil lyde under afslutning</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="55"/>
         <source>Automatically create/remove desktop symlinks for applications that are installed/removed</source>
-        <translation type="unfinished"></translation>
+        <translation>Opret/fjern automatisk skrivebords-symlinks til installerede/fjernede programmer</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="58"/>
         <source>Manage desktop app links</source>
-        <translation type="unfinished"></translation>
+        <translation>Håndtér skrivebordsprogramlinks</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="65"/>
         <source>Show application crash data</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis programnebrudsdata</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="74"/>
         <source>Change User Icon</source>
-        <translation type="unfinished">Skift Bruger Ikon</translation>
+        <translation>Skift brugerikon</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="112"/>
         <source>Time Format:</source>
-        <translation type="unfinished">Tidsformat:</translation>
+        <translation>Klokkeslætformat:</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="124"/>
         <location filename="../pages/page_session_options.ui" line="168"/>
         <source>View format codes</source>
-        <translation type="unfinished">Vis format koder</translation>
+        <translation>Vis formatkoder</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="139"/>
         <location filename="../pages/page_session_options.ui" line="183"/>
         <source>Sample:</source>
-        <translation type="unfinished">Prøve:</translation>
+        <translation>Prøve:</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="156"/>
         <source>Date Format:</source>
-        <translation type="unfinished">Datoformat:</translation>
+        <translation>Datoformat:</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="203"/>
         <source>Display Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis format</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="234"/>
         <source>Reset Desktop Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Nulstil skrivebordsindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="253"/>
         <source>Return to system defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Vend tilbage til systemstandarder</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="260"/>
         <source>Return to Lumina defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Vend tilbage til Luminas standarder</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="19"/>
         <source>Time (Date as tooltip)</source>
-        <translation type="unfinished">Tid (Dato som værktøjstip)</translation>
+        <translation>Klokkeslæt (dato som værktøjstip)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="20"/>
         <source>Date (Time as tooltip)</source>
-        <translation type="unfinished"></translation>
+        <translation>Dato (klokkeslæt som værktøjstip)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="21"/>
         <source>Time first then Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Først klokkeslæt, så dato</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="22"/>
         <source>Date first then Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Først dato, så klokkeslæt</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="70"/>
         <source>Desktop Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebordsindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="113"/>
         <source>Select an image</source>
-        <translation type="unfinished">Vælg et billede</translation>
+        <translation>Vælg et billede</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="114"/>
         <source>Images</source>
-        <translation type="unfinished">Billeder</translation>
+        <translation>Billeder</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="118"/>
         <source>Reset User Image</source>
-        <translation type="unfinished">Nulstil Bruger billede</translation>
+        <translation>Nulstil brugerbillede</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="118"/>
         <source>Would you like to reset the user image to the system default?</source>
-        <translation type="unfinished">Vil du gerne nulstille bruger billedet til system standard?</translation>
+        <translation>Vil du nulstille brugerbilledet til systemstandarden?</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="157"/>
         <source>Valid Time Codes:</source>
-        <translation type="unfinished">Gyldig tids koder:</translation>
+        <translation>Gyldige klokkeslætkoder:</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="158"/>
         <source>%1: Hour without leading zero (1)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Klokkeslæt uden foranstillet nul (1)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="159"/>
         <source>%1: Hour with leading zero (01)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Klokkeslæt med foranstillet nul (01)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="160"/>
         <source>%1: Minutes without leading zero (2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Minutter uden foranstillet nul (2)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="161"/>
         <source>%1: Minutes with leading zero (02)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Minutter med foranstillet nul (02)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="162"/>
         <source>%1: Seconds without leading zero (3)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Sekunder uden foranstillet nul (3)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="163"/>
         <source>%1: Seconds with leading zero (03)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Sekunder med foranstillet nul (03)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="164"/>
         <source>%1: AM/PM (12-hour) clock (upper or lower case)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: AM/PM (12-timer) ur (store og små bogstaver)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="165"/>
         <source>%1: Timezone</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Tidszone</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="166"/>
         <source>Time Codes</source>
-        <translation type="unfinished"></translation>
+        <translation>Klokkeslætkoder</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="180"/>
         <source>Valid Date Codes:</source>
-        <translation type="unfinished"></translation>
+        <translation>Gyldig datokodeks:</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="181"/>
         <source>%1: Numeric day without a leading zero (1)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Numerisk dag uden foranstillede nul (1)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="182"/>
         <source>%1: Numeric day with leading zero (01)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Numerisk dag med foranstillede nul (01)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="183"/>
         <source>%1: Day as abbreviation (localized)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Dag som forkortelse (lokaliseret)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="184"/>
         <source>%1: Day as full name (localized)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Dag som fuldt navn (lokaliseret)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="185"/>
         <source>%1: Numeric month without leading zero (2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Numerisk måned uden foranstillet nul (2)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="186"/>
         <source>%1: Numeric month with leading zero (02)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Numerisk måned med foranstillet nul (02)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="187"/>
         <source>%1: Month as abbreviation (localized)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Måned som forkortelse (lokaliseret)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="188"/>
         <source>%1: Month as full name (localized)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Måned som fuldt navn (lokaliseret)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="189"/>
         <source>%1: Year as 2-digit number (15)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: År som 2-tegnstal (17)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="190"/>
         <source>%1: Year as 4-digit number (2015)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: År som 4-tegnstal (2017)</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="191"/>
         <source>Text may be contained within single-quotes to ignore replacements</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst må være inden i enkelte anførselstegn for at ignorer erstatninger</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.cpp" line="192"/>
         <source>Date Codes</source>
-        <translation type="unfinished"></translation>
+        <translation>Datokoder</translation>
     </message>
 </context>
 <context>
@@ -1825,78 +1828,78 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_theme.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="36"/>
         <source>Desktop Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrivebordstema</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="42"/>
         <source>Font:</source>
-        <translation type="unfinished">Skrifttype:</translation>
+        <translation>Skrifttype:</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="56"/>
         <source>Font Size:</source>
-        <translation type="unfinished">Skriftstørrelse:</translation>
+        <translation>Skriftstørrelse:</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="63"/>
         <source> point</source>
-        <translation type="unfinished"> point</translation>
+        <translation> punkt</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="70"/>
         <source>Theme Template:</source>
-        <translation type="unfinished">Temaskabelon:</translation>
+        <translation>Temaskabelon:</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="86"/>
         <source>Create/Edit a theme template (Advanced)</source>
-        <translation type="unfinished">Opret/Rediger en tema skabelon (Avanceret)</translation>
+        <translation>Opret/rediger en temaskabelon (avanceret)</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="92"/>
         <location filename="../pages/page_theme.ui" line="126"/>
         <source>Edit</source>
-        <translation type="unfinished">Redigér</translation>
+        <translation>Rediger</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="104"/>
         <source>Color Scheme:</source>
-        <translation type="unfinished">Farveskema:</translation>
+        <translation>Farveskema:</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="120"/>
         <source>Create/Edit a color scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Opret/rediger et farveskema</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="138"/>
         <source>Icon Pack:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ikonpakke:</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="148"/>
         <source>Mouse Cursors:</source>
-        <translation type="unfinished"></translation>
+        <translation>Musemarkører:</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="192"/>
         <source>Application Themes</source>
-        <translation type="unfinished"></translation>
+        <translation>Programtemaer</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="198"/>
         <source>Qt5 Theme Engine</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt5-temamotor</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.cpp" line="58"/>
         <source>Theme Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Temaindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.cpp" line="73"/>
@@ -1904,7 +1907,7 @@ Skal den overskrives?</translation>
         <location filename="../pages/page_theme.cpp" line="173"/>
         <location filename="../pages/page_theme.cpp" line="199"/>
         <source>Local</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokal</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.cpp" line="80"/>
@@ -1912,17 +1915,17 @@ Skal den overskrives?</translation>
         <location filename="../pages/page_theme.cpp" line="180"/>
         <location filename="../pages/page_theme.cpp" line="206"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation>System</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.cpp" line="137"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.cpp" line="138"/>
         <source>Manual Setting</source>
-        <translation type="unfinished"></translation>
+        <translation>Manuel indstilling</translation>
     </message>
 </context>
 <context>
@@ -1930,150 +1933,150 @@ Skal den overskrives?</translation>
     <message>
         <location filename="../pages/page_wallpaper.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.ui" line="90"/>
         <source>Single Background</source>
-        <translation type="unfinished">Enlig Baggrund</translation>
+        <translation>Enkel baggrund</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.ui" line="100"/>
         <source>Rotate Background</source>
-        <translation type="unfinished">Rotér Baggrund</translation>
+        <translation>Roter baggrund</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.ui" line="107"/>
         <source> Minutes</source>
-        <translation type="unfinished"> Minutter</translation>
+        <translation> Minutter</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.ui" line="110"/>
         <source>Every </source>
-        <translation type="unfinished">Hver </translation>
+        <translation>Hver </translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.ui" line="133"/>
         <source>Layout:</source>
-        <translation type="unfinished">Layout:</translation>
+        <translation>Layout:</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="56"/>
         <source>Wallpaper Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Tapetindstillinger</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="66"/>
         <source>System Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Systemstandard</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="67"/>
         <location filename="../pages/page_wallpaper.cpp" line="222"/>
         <source>Solid Color: %1</source>
-        <translation type="unfinished">Ensfarvet farve: %1</translation>
+        <translation>Ensfarvet farve: %1</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="78"/>
         <source>Screen Resolution:</source>
-        <translation type="unfinished"></translation>
+        <translation>Skræmopløsning:</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="100"/>
         <location filename="../pages/page_wallpaper.cpp" line="101"/>
         <source>Select Color</source>
-        <translation type="unfinished">Vælg farve</translation>
+        <translation>Vælg farve</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="120"/>
         <source>File(s)</source>
-        <translation type="unfinished">Fil(er)</translation>
+        <translation>Fil(er)</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="121"/>
         <source>Directory (Single)</source>
-        <translation type="unfinished">Mappe (Enkelt)</translation>
+        <translation>Mappe (enkel)</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="122"/>
         <source>Directory (Recursive)</source>
-        <translation type="unfinished"></translation>
+        <translation>Mappe (rekursiv)</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="123"/>
         <source>Solid Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Solid farve</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="127"/>
         <source>Automatic</source>
-        <translation type="unfinished">Automatisk</translation>
+        <translation>Automatisk</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="128"/>
         <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>Fuldskærm</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="129"/>
         <source>Fit screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Tilpas skærm</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="130"/>
         <source>Tile</source>
-        <translation type="unfinished">Flise</translation>
+        <translation>Fliselæg</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="131"/>
         <source>Center</source>
-        <translation type="unfinished">Centrér</translation>
+        <translation>I midten</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="132"/>
         <source>Top Left</source>
-        <translation type="unfinished">Øverst til venstre</translation>
+        <translation>Øverst til venstre</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="133"/>
         <source>Top Right</source>
-        <translation type="unfinished">Øverst til højre</translation>
+        <translation>Øverst til højre</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="134"/>
         <source>Bottom Left</source>
-        <translation type="unfinished">Nederst til venstre</translation>
+        <translation>Nederst til venstre</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="135"/>
         <source>Bottom Right</source>
-        <translation type="unfinished">Nederst til højre</translation>
+        <translation>Nederst til højre</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="143"/>
         <source>No Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen baggrund</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="143"/>
         <source>(use system default)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brug systemstandard)</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="163"/>
         <source>File does not exist</source>
-        <translation type="unfinished"></translation>
+        <translation>Fil findes ikke</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="203"/>
         <source>Find Background Image(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Find baggrundsbillede(r)</translation>
     </message>
     <message>
         <location filename="../pages/page_wallpaper.cpp" line="234"/>
         <location filename="../pages/page_wallpaper.cpp" line="259"/>
         <source>Find Background Image Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Find baggrudsbilledmappe</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_de.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_de.ts
index 7109453a..9d145f55 100644
--- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_de.ts
+++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_de.ts
@@ -340,7 +340,7 @@
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="67"/>
-        <source>Start menu alternative focusing on the user&apos;s files, directories, and favorites.</source>
+        <source>Start menu alternative focusing on the user's files, directories, and favorites.</source>
         <translation>Startmenüalternative, die Benutzerdateien, Verzeichnisse und Lesezeichen fokussiert.</translation>
     </message>
     <message>
@@ -531,12 +531,12 @@
     <message>
         <location filename="../LPlugins.cpp" line="312"/>
         <source>Lock Session</source>
-        <translation type="unfinished"></translation>
+        <translation>Sitzung sperren</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="313"/>
         <source>Lock the current desktop session</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktuelle Arbeitsflächen-Sitzung sperren</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="323"/>
@@ -711,17 +711,17 @@
     <message>
         <location filename="../pages/getPage.h" line="29"/>
         <source>Wallpaper</source>
-        <translation type="unfinished"></translation>
+        <translation>Hintergrundbild</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="30"/>
         <source>Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Thema</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="32"/>
         <source>Autostart</source>
-        <translation type="unfinished"></translation>
+        <translation>Autostart</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="33"/>
@@ -761,27 +761,27 @@
     <message>
         <location filename="../pages/getPage.h" line="36"/>
         <source>Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Arbeitsfläche</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="37"/>
         <source>Panels</source>
-        <translation type="unfinished"></translation>
+        <translation>Leisten</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="38"/>
         <source>Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Menü</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="42"/>
         <source>Input Device Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingabegeräteeinstellungen</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="42"/>
         <source>Adjust keyboard and mouse devices</source>
-        <translation type="unfinished"></translation>
+        <translation>Tastatur und Mausgeräte anpassen</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="36"/>
@@ -826,7 +826,7 @@
     <message>
         <location filename="../pages/getPage.h" line="39"/>
         <source>Localization</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokalisierung</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="40"/>
@@ -1073,7 +1073,7 @@
     <message>
         <location filename="../pages/page_compton.ui" line="39"/>
         <source>Only use compositing with GPU acceleration </source>
-        <translation type="unfinished"></translation>
+        <translation>Compositing nur mit GPU-Beschleunigung verwenden </translation>
     </message>
     <message>
         <location filename="../pages/page_compton.cpp" line="38"/>
@@ -1253,12 +1253,12 @@
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="244"/>
-        <source>&quot;Mod1&quot;:	Alt key
-&quot;Mod4&quot;: 	Windows/Mac key
-&quot;Control&quot;:	Ctrl key</source>
-        <translation>&quot;Mod1&quot;:	Alt-Taste
-&quot;Mod4&quot;: 	Windows/Mac-Taste
-&quot;Steuerung&quot;:	Strg-Taste</translation>
+        <source>"Mod1":	Alt key
+"Mod4": 	Windows/Mac key
+"Control":	Ctrl key</source>
+        <translation>"Mod1":	Alt-Taste
+"Mod4": 	Windows/Mac-Taste
+"Steuerung":	Strg-Taste</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.cpp" line="71"/>
@@ -1436,12 +1436,12 @@
     <message>
         <location filename="../pages/page_interface_panels.ui" line="69"/>
         <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_panels.ui" line="82"/>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation>Import</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_panels.cpp" line="52"/>
@@ -1474,7 +1474,7 @@
     <message>
         <location filename="../pages/page_main.cpp" line="61"/>
         <source>Desktop Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Arbeitsflächen-Standardeinstellungen</translation>
     </message>
     <message>
         <location filename="../pages/page_main.cpp" line="65"/>
@@ -1497,27 +1497,27 @@
     <message>
         <location filename="../pages/page_mouse.cpp" line="53"/>
         <source>Input Device Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingabegeräteeinstellungen</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="81"/>
         <source>Mouse #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Maus #%1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="85"/>
         <source>Keyboard #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Tastatur #%1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="106"/>
         <source>Extension Device #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterungsgerät #%1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="107"/>
         <source>Master Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Hauptgerät</translation>
     </message>
 </context>
 <context>
@@ -1613,7 +1613,7 @@
     <message>
         <location filename="../pages/page_session_options.ui" line="65"/>
         <source>Show application crash data</source>
-        <translation type="unfinished"></translation>
+        <translation>Anwendungsabsturzdaten anzeigen</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="74"/>
@@ -1833,7 +1833,7 @@
     <message>
         <location filename="../pages/page_theme.ui" line="36"/>
         <source>Desktop Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Arbeitsflächenthema</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="42"/>
@@ -1889,7 +1889,7 @@
     <message>
         <location filename="../pages/page_theme.ui" line="192"/>
         <source>Application Themes</source>
-        <translation type="unfinished"></translation>
+        <translation>Anwendungsthemen</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="198"/>
@@ -1920,12 +1920,12 @@
     <message>
         <location filename="../pages/page_theme.cpp" line="137"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.cpp" line="138"/>
         <source>Manual Setting</source>
-        <translation type="unfinished"></translation>
+        <translation>Manuelle Einstellung</translation>
     </message>
 </context>
 <context>
diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_lt.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_lt.ts
index ddee957a..6e2c7388 100644
--- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_lt.ts
+++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_lt.ts
@@ -776,12 +776,12 @@
     <message>
         <location filename="../pages/getPage.h" line="42"/>
         <source>Input Device Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Įvesties įrenginio nustatymai</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="42"/>
         <source>Adjust keyboard and mouse devices</source>
-        <translation type="unfinished"></translation>
+        <translation>Derinti klaviatūros ir pelės įrenginius</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="36"/>
@@ -826,7 +826,7 @@
     <message>
         <location filename="../pages/getPage.h" line="39"/>
         <source>Localization</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokalizavimas</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="40"/>
@@ -1073,7 +1073,7 @@
     <message>
         <location filename="../pages/page_compton.ui" line="39"/>
         <source>Only use compositing with GPU acceleration </source>
-        <translation type="unfinished"></translation>
+        <translation>Naudoti komponavimą tik su vaizdo plokštės (GPU) spartinimu </translation>
     </message>
     <message>
         <location filename="../pages/page_compton.cpp" line="38"/>
@@ -1436,12 +1436,12 @@
     <message>
         <location filename="../pages/page_interface_panels.ui" line="69"/>
         <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilis</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_panels.ui" line="82"/>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation>Importuoti</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_panels.cpp" line="52"/>
@@ -1474,7 +1474,7 @@
     <message>
         <location filename="../pages/page_main.cpp" line="61"/>
         <source>Desktop Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Darbalaukio numatytosios reikšmės</translation>
     </message>
     <message>
         <location filename="../pages/page_main.cpp" line="65"/>
@@ -1492,32 +1492,32 @@
     <message>
         <location filename="../pages/page_mouse.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Forma</translation>
+        <translation>Forma</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="53"/>
         <source>Input Device Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Įvesties įrenginio nustatymai</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="81"/>
         <source>Mouse #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Pelė #%1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="85"/>
         <source>Keyboard #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Klaviatūra #%1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="106"/>
         <source>Extension Device #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Plėtinio įrenginys #%1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="107"/>
         <source>Master Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Pagrindinis įrenginys</translation>
     </message>
 </context>
 <context>
@@ -1613,7 +1613,7 @@
     <message>
         <location filename="../pages/page_session_options.ui" line="65"/>
         <source>Show application crash data</source>
-        <translation type="unfinished"></translation>
+        <translation>Rodyti programų trikčių duomenis</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="74"/>
@@ -1833,7 +1833,7 @@
     <message>
         <location filename="../pages/page_theme.ui" line="36"/>
         <source>Desktop Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Darbalaukio tema</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="42"/>
@@ -1889,12 +1889,12 @@
     <message>
         <location filename="../pages/page_theme.ui" line="192"/>
         <source>Application Themes</source>
-        <translation type="unfinished"></translation>
+        <translation>Programų tema</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="198"/>
         <source>Qt5 Theme Engine</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt5 temų modulis</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.cpp" line="58"/>
@@ -1920,12 +1920,12 @@
     <message>
         <location filename="../pages/page_theme.cpp" line="137"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Joks</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.cpp" line="138"/>
         <source>Manual Setting</source>
-        <translation type="unfinished"></translation>
+        <translation>Rankinis nustatymas</translation>
     </message>
 </context>
 <context>
diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_pl.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_pl.ts
index c52873a3..25fb461c 100644
--- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_pl.ts
+++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_pl.ts
@@ -340,8 +340,8 @@
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="67"/>
-        <source>Start menu alternative focusing on the user&apos;s files, directories, and favorites.</source>
-        <translation type="unfinished"></translation>
+        <source>Start menu alternative focusing on the user's files, directories, and favorites.</source>
+        <translation>Alternatywny wygląd menu start, pokazujący pliki użytkownika, jego katalogi i ulubione elementy.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="73"/>
@@ -351,7 +351,7 @@
     <message>
         <location filename="../LPlugins.cpp" line="74"/>
         <source>Start menu alternative which focuses on launching applications.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alternatywny wygląd menu start, ułatwiający szybkie uruchamianie aplikacji.</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="94"/>
@@ -371,12 +371,12 @@
     <message>
         <location filename="../LPlugins.cpp" line="130"/>
         <source>View and control any running application windows (group similar windows under a single button).</source>
-        <translation type="unfinished"></translation>
+        <translation>Pogląd i kontrola każdego okna uruchomionej aplikacji (grupowanie tych samych aplikacji).</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="137"/>
         <source>View and control any running application windows (every individual window has a button)</source>
-        <translation type="unfinished"></translation>
+        <translation>Pogląd i kontrola każdego okna uruchomionej aplikacji (nie grupuj aplikacji).</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="150"/>
@@ -500,12 +500,12 @@
         <location filename="../LPlugins.cpp" line="178"/>
         <location filename="../LPlugins.cpp" line="305"/>
         <source>Menu Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu Skrypt</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="205"/>
         <source>Configurable area for automatically showing desktop icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurowalny obszar do automatycznego pokazywania ikon pulpitu</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="263"/>
@@ -520,23 +520,23 @@
     <message>
         <location filename="../LPlugins.cpp" line="292"/>
         <source>List the open, minimized, active, and urgent application windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista otwartych, zminimalizowanych i aktywnych okien aplikacji</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="179"/>
         <location filename="../LPlugins.cpp" line="306"/>
         <source>Run an external script to generate a user defined menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Uruchom skrypt do generowania menu</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="312"/>
         <source>Lock Session</source>
-        <translation type="unfinished"></translation>
+        <translation>Zablokuj sesję</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="313"/>
         <source>Lock the current desktop session</source>
-        <translation type="unfinished"></translation>
+        <translation>Zablokuj sesję pulpitu</translation>
     </message>
     <message>
         <location filename="../LPlugins.cpp" line="323"/>
@@ -711,17 +711,17 @@
     <message>
         <location filename="../pages/getPage.h" line="29"/>
         <source>Wallpaper</source>
-        <translation type="unfinished"></translation>
+        <translation>Tapeta</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="30"/>
         <source>Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Motyw</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="32"/>
         <source>Autostart</source>
-        <translation type="unfinished"></translation>
+        <translation>Uruchamianie automatyczne</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="33"/>
@@ -761,27 +761,27 @@
     <message>
         <location filename="../pages/getPage.h" line="36"/>
         <source>Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulpit</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="37"/>
         <source>Panels</source>
-        <translation type="unfinished"></translation>
+        <translation>Panele</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="38"/>
         <source>Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="42"/>
         <source>Input Device Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia urządzeń wejściowych</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="42"/>
         <source>Adjust keyboard and mouse devices</source>
-        <translation type="unfinished"></translation>
+        <translation>Skonfiguruj klawiaturę oraz mysz</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="36"/>
@@ -791,7 +791,7 @@
     <message>
         <location filename="../pages/getPage.h" line="36"/>
         <source>Change what icons or tools are embedded on the desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Ikony lub narzędzia wyświetlane na pulpicie</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="37"/>
@@ -801,12 +801,12 @@
     <message>
         <location filename="../pages/getPage.h" line="37"/>
         <source>Change any floating panels and what they show</source>
-        <translation type="unfinished"></translation>
+        <translation>Panele i ich zawartość</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="38"/>
         <source>Menu Plugins</source>
-        <translation type="unfinished"></translation>
+        <translation>Wtyczki menu</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="38"/>
@@ -821,12 +821,12 @@
     <message>
         <location filename="../pages/getPage.h" line="39"/>
         <source>Change the default locale settings for this user</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmień ustawienia językowe tego użytkownika</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="39"/>
         <source>Localization</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia językowe</translation>
     </message>
     <message>
         <location filename="../pages/getPage.h" line="40"/>
@@ -849,7 +849,7 @@
     <message>
         <location filename="../ScriptDialog.ui" line="14"/>
         <source>Setup a JSON Menu Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw skrypt menu używając JSON</translation>
     </message>
     <message>
         <location filename="../ScriptDialog.ui" line="25"/>
@@ -885,7 +885,7 @@
     <message>
         <location filename="../ScriptDialog.cpp" line="57"/>
         <source>Select a menu script</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz skrypt menu</translation>
     </message>
     <message>
         <location filename="../ScriptDialog.cpp" line="64"/>
@@ -945,7 +945,7 @@
     <message>
         <location filename="../mainWindow.ui" line="14"/>
         <source>MainWindow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">MainWindow</translation>
     </message>
     <message>
         <location filename="../mainWindow.ui" line="23"/>
@@ -1068,17 +1068,17 @@
     <message>
         <location filename="../pages/page_compton.ui" line="32"/>
         <source>Disable Compositing Manager (session restart required)</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyłącz menedżera kompozycji (wymagany restart sesji)</translation>
     </message>
     <message>
         <location filename="../pages/page_compton.ui" line="39"/>
         <source>Only use compositing with GPU acceleration </source>
-        <translation type="unfinished"></translation>
+        <translation>Menedżer kompozycji tylko z akceleracją GPU. </translation>
     </message>
     <message>
         <location filename="../pages/page_compton.cpp" line="38"/>
         <source>Compositor Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia menedżera kompozycji</translation>
     </message>
 </context>
 <context>
@@ -1199,7 +1199,7 @@
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="14"/>
         <source>page_fluxbox_keys</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">page_fluxbox_keys</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="34"/>
@@ -1249,16 +1249,16 @@
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="220"/>
         <source>View Syntax Codes</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaż składnię kodu</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.ui" line="244"/>
-        <source>&quot;Mod1&quot;:	Alt key
-&quot;Mod4&quot;: 	Windows/Mac key
-&quot;Control&quot;:	Ctrl key</source>
-        <translation>&quot;Mod1&quot;:	Alt key
-&quot;Mod4&quot;: 	Windows/Mac key
-&quot;Control&quot;:	Ctrl key</translation>
+        <source>"Mod1":	Alt key
+"Mod4": 	Windows/Mac key
+"Control":	Ctrl key</source>
+        <translation>"Mod1":	klawisz Alt
+"Mod4": 	klawisz Windows/Mac
+"Control":  klawisz Ctrl</translation>
     </message>
     <message>
         <location filename="../pages/page_fluxbox_keys.cpp" line="71"/>
@@ -1436,12 +1436,12 @@
     <message>
         <location filename="../pages/page_interface_panels.ui" line="69"/>
         <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_panels.ui" line="82"/>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation>Import</translation>
     </message>
     <message>
         <location filename="../pages/page_interface_panels.cpp" line="52"/>
@@ -1474,7 +1474,7 @@
     <message>
         <location filename="../pages/page_main.cpp" line="61"/>
         <source>Desktop Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyślne ustawienia pulpitu</translation>
     </message>
     <message>
         <location filename="../pages/page_main.cpp" line="65"/>
@@ -1492,32 +1492,32 @@
     <message>
         <location filename="../pages/page_mouse.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formularz</translation>
+        <translation>Formularz</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="53"/>
         <source>Input Device Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia urządzeń wejścia</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="81"/>
         <source>Mouse #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Mysz #%1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="85"/>
         <source>Keyboard #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Klawiatura #%1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="106"/>
         <source>Extension Device #%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Urządzenie rozszerzeń #%1</translation>
     </message>
     <message>
         <location filename="../pages/page_mouse.cpp" line="107"/>
         <source>Master Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Urządzenie główne</translation>
     </message>
 </context>
 <context>
@@ -1608,12 +1608,12 @@
     <message>
         <location filename="../pages/page_session_options.ui" line="58"/>
         <source>Manage desktop app links</source>
-        <translation type="unfinished"></translation>
+        <translation>Zarządzaj skrótami aplikacji pulpitu</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="65"/>
         <source>Show application crash data</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokazuj informacje o błędach aplikacji</translation>
     </message>
     <message>
         <location filename="../pages/page_session_options.ui" line="74"/>
@@ -1833,7 +1833,7 @@
     <message>
         <location filename="../pages/page_theme.ui" line="36"/>
         <source>Desktop Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Motyw pulpitu</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="42"/>
@@ -1889,12 +1889,12 @@
     <message>
         <location filename="../pages/page_theme.ui" line="192"/>
         <source>Application Themes</source>
-        <translation type="unfinished"></translation>
+        <translation>Motyw aplikacji</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.ui" line="198"/>
         <source>Qt5 Theme Engine</source>
-        <translation type="unfinished"></translation>
+        <translation>Silnik motywu Qt5</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.cpp" line="58"/>
@@ -1920,12 +1920,12 @@
     <message>
         <location filename="../pages/page_theme.cpp" line="137"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Żaden</translation>
     </message>
     <message>
         <location filename="../pages/page_theme.cpp" line="138"/>
         <source>Manual Setting</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia manualne</translation>
     </message>
 </context>
 <context>
diff --git a/src-qt5/core-utils/lumina-config/lumina-config.pro b/src-qt5/core-utils/lumina-config/lumina-config.pro
index d690bcb3..5494393e 100644
--- a/src-qt5/core-utils/lumina-config/lumina-config.pro
+++ b/src-qt5/core-utils/lumina-config/lumina-config.pro
@@ -16,11 +16,11 @@ include(../../core/libLumina/LuminaXDG.pri)
 include(../../core/libLumina/LuminaSingleApplication.pri)
 include(../../core/libLumina/LuminaThemes.pri)
 
-NO_XINPUT{
+#NO_XINPUT{
   DEFINES+=NO_XINPUT
-}else{
-  include(../../core/libLumina/LInputDevice.pri)
-}
+#}else{
+#  include(../../core/libLumina/LInputDevice.pri)
+#}
 
 SOURCES += main.cpp \
 	   mainWindow.cpp \
diff --git a/src-qt5/core-utils/lumina-config/pages/getPage.h b/src-qt5/core-utils/lumina-config/pages/getPage.h
index c820283e..59dbcd2b 100644
--- a/src-qt5/core-utils/lumina-config/pages/getPage.h
+++ b/src-qt5/core-utils/lumina-config/pages/getPage.h
@@ -38,11 +38,6 @@ static QList<PAGEINFO> KnownPages(){
   list << PageInfo("interface-menu", QObject::tr("Menu"), QObject::tr("Menu Plugins"), "format-list-unordered",QObject::tr("Change what options are shown on the desktop context menu"), "interface", QStringList(), QStringList() << "desktop" << "menu" << "plugins" << "shortcuts");
   list << PageInfo("session-locale", QObject::tr("Localization"), QObject::tr("Locale Settings"), "preferences-desktop-locale",QObject::tr("Change the default locale settings for this user"), "user", QStringList(), QStringList() << "user"<<"locale"<<"language"<<"translations");
   list << PageInfo("session-options", QObject::tr("General Options"), QObject::tr("User Settings"), "configure",QObject::tr("Change basic user settings such as time/date formats"), "user", QStringList(), QStringList() << "user"<<"settings"<<"time"<<"date"<<"icon"<<"reset"<<"numlock"<<"clock");
-  #ifndef NO_XINPUT
-  if(LUtils::isValidBinary("xinput")){
-    list << PageInfo("input-devices", QObject::tr("Input Device Settings"), QObject::tr("Input Device Settings"), "preferences-desktop-peripherals",QObject::tr("Adjust keyboard and mouse devices"), "user", QStringList(), QStringList() << "user"<<"speed"<<"accel"<<"mouse" << "keyboard");
-  }
-  #endif
  // list << PageInfo("mouse-settings", QObject::tr("TrueOS Mouse Settings"), QObject::tr("TrueOS Mouse Settings"), "preferences-desktop-mouse",QObject::tr("Adjust mouse devices"), "user", QStringList(), QStringList() << "user"<<"speed"<<"accel"<<"mouse");
  // list << PageInfo("bluetooth-settings", QObject::tr("TrueOS Bluetooth Settings"), QObject::tr("TrueOS Bluetooth Settings"), "preferences-desktop-bluetooth",QObject::tr("Setup Bluetooth devices"), "user", QStringList(), QStringList() << "user"<<"bluetooth"<<"audio");
 
@@ -64,10 +59,6 @@ static QList<PAGEINFO> KnownPages(){
 #include "page_session_options.h"
 #include "page_compton.h"
 
-#ifndef NO_XINPUT
-#include "page_mouse.h"
-#endif
-
 // #include "page_mouse_trueos.h"
 // #include "page_bluetooth_trueos.h"
 
@@ -86,9 +77,6 @@ static PageWidget* GetNewPage(QString id, QWidget *parent){
   else if(id=="session-locale"){ page = new page_session_locale(parent); }
   else if(id=="session-options"){ page = new page_session_options(parent); }
   else if(id=="compton"){ page = new page_compton(parent); }
-  #ifndef NO_XINPUT
-  else if(id=="input-devices"){ page = new page_mouse(parent); }
-  #endif
 
  // else if(id=="mouse-settings"){ page = new page_mouse_trueos(parent); }
  // else if(id=="bluetooth-settings"){ page = new page_bluetooth_trueos(parent); }
diff --git a/src-qt5/core-utils/lumina-config/pages/page_defaultapps.cpp b/src-qt5/core-utils/lumina-config/pages/page_defaultapps.cpp
index b2a0896c..a21653c9 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_defaultapps.cpp
+++ b/src-qt5/core-utils/lumina-config/pages/page_defaultapps.cpp
@@ -42,92 +42,23 @@ void page_defaultapps::LoadSettings(int){
   emit HasPendingChanges(false);
   emit ChangePageTitle( tr("Default Applications") );
 
-//First load the lumina-open specific defaults
-    //  - Default File Manager
-  QString tmp = LXDG::findDefaultAppForMime("inode/directory"); 
-  if(tmp.isEmpty()){ tmp = "lumina-fm"; }
-  if( !QFile::exists(tmp) && !LUtils::isValidBinary(tmp) ){ qDebug() << "Invalid Settings:" << tmp; tmp.clear(); } //invalid settings
-  if(tmp.endsWith(".desktop")){
-    XDGDesktop file(tmp);
-    if(file.type == XDGDesktop::BAD){
-      //Might be a binary - just print out the raw "path"
-      ui->tool_default_filemanager->setText(tmp.section("/",-1));
-      ui->tool_default_filemanager->setIcon( LXDG::findIcon("application-x-executable","") );
-    }else{
-      ui->tool_default_filemanager->setText(file.name);
-      ui->tool_default_filemanager->setIcon(LXDG::findIcon(file.icon,"") );
-    }
-  }else if(tmp.isEmpty()){
-    ui->tool_default_filemanager->setText(tr("Click to Set"));
-    ui->tool_default_filemanager->setIcon( LXDG::findIcon("system-help","") );
-  }else{
-    //Might be a binary - just print out the raw "path"
-      ui->tool_default_filemanager->setText(tmp.section("/",-1));
-      ui->tool_default_filemanager->setIcon( LXDG::findIcon("application-x-executable","") );
-  }
+  //First load the lumina-open specific defaults
+  //  - Default File Manager
+  defaultFileManager = LXDG::findDefaultAppForMime("inode/directory"); 
+  if(defaultFileManager.isEmpty()){ defaultFileManager = "lumina-fm"; }
+  updateDefaultButton(ui->tool_default_filemanager, defaultFileManager);
+
   // - Default Terminal
-  tmp =LXDG::findDefaultAppForMime("application/terminal"); //sessionsettings->value("default-terminal", "xterm").toString();
-  if( !QFile::exists(tmp) && !LUtils::isValidBinary(tmp) ){ qDebug() << "Invalid Settings:" << tmp; tmp.clear(); } //invalid settings
-  if(tmp.endsWith(".desktop")){
-    XDGDesktop file(tmp);
-    if(file.type == XDGDesktop::BAD){
-      //Might be a binary - just print out the raw "path"
-      ui->tool_default_terminal->setText(tmp.section("/",-1));
-      ui->tool_default_terminal->setIcon( LXDG::findIcon("application-x-executable","") );
-    }else{
-      ui->tool_default_terminal->setText(file.name);
-      ui->tool_default_terminal->setIcon(LXDG::findIcon(file.icon,"") );
-    }
-  }else if(tmp.isEmpty()){
-    ui->tool_default_terminal->setText(tr("Click to Set"));
-    ui->tool_default_terminal->setIcon( LXDG::findIcon("system-help","") );
-  }else{
-    //Might be a binary - just print out the raw "path"
-      ui->tool_default_terminal->setText(tmp.section("/",-1));
-      ui->tool_default_terminal->setIcon( LXDG::findIcon("application-x-executable","") );
-  }
+  defaultTerminal = LXDG::findDefaultAppForMime("application/terminal"); //sessionsettings->value("default-terminal", "xterm").toString();
+  updateDefaultButton(ui->tool_default_terminal, defaultTerminal);
+
   // - Default Web Browser
-  tmp = LXDG::findDefaultAppForMime("x-scheme-handler/http"); //appsettings->value("default/webbrowser", "").toString();
-  if( !QFile::exists(tmp) && !LUtils::isValidBinary(tmp) ){ qDebug() << "Invalid Settings:" << tmp; tmp.clear(); } //invalid settings
-  if(tmp.endsWith(".desktop")){
-    XDGDesktop file(tmp);
-    if(file.type == XDGDesktop::BAD){
-      //Might be a binary - just print out the raw "path"
-      ui->tool_default_webbrowser->setText(tmp.section("/",-1));
-      ui->tool_default_webbrowser->setIcon( LXDG::findIcon("application-x-executable","") );
-    }else{
-      ui->tool_default_webbrowser->setText(file.name);
-      ui->tool_default_webbrowser->setIcon(LXDG::findIcon(file.icon,"") );
-    }
-  }else if(tmp.isEmpty()){
-    ui->tool_default_webbrowser->setText(tr("Click to Set"));
-    ui->tool_default_webbrowser->setIcon( LXDG::findIcon("system-help","") );
-  }else{
-    //Might be a binary - just print out the raw "path"
-      ui->tool_default_webbrowser->setText(tmp.section("/",-1));
-      ui->tool_default_webbrowser->setIcon( LXDG::findIcon("application-x-executable","") );
-  }
+  defaultBrowser = LXDG::findDefaultAppForMime("x-scheme-handler/http"); //appsettings->value("default/webbrowser", "").toString();
+  updateDefaultButton(ui->tool_default_webbrowser, defaultBrowser);
+
   // - Default Email Client
-  tmp = LXDG::findDefaultAppForMime("application/email"); //appsettings->value("default/email", "").toString();
-  if( !QFile::exists(tmp) && !LUtils::isValidBinary(tmp) ){ qDebug() << "Invalid Settings:" << tmp; tmp.clear(); } //invalid settings
-  if(tmp.endsWith(".desktop")){
-    XDGDesktop file(tmp);
-    if(file.type == XDGDesktop::BAD){
-      //Might be a binary - just print out the raw "path"
-      ui->tool_default_email->setText(tmp.section("/",-1));
-      ui->tool_default_email->setIcon( LXDG::findIcon("application-x-executable","") );
-    }else{
-      ui->tool_default_email->setText(file.name);
-      ui->tool_default_email->setIcon(LXDG::findIcon(file.icon,"") );
-    }
-  }else if(tmp.isEmpty()){
-    ui->tool_default_email->setText(tr("Click to Set"));
-    ui->tool_default_email->setIcon( LXDG::findIcon("system-help","") );
-  }else{
-    //Might be a binary - just print out the raw "path"
-      ui->tool_default_email->setText(tmp.section("/",-1));
-      ui->tool_default_email->setIcon( LXDG::findIcon("application-x-executable","") );
-  }
+  defaultEmail = LXDG::findDefaultAppForMime("application/email"); //appsettings->value("default/email", "").toString();
+  updateDefaultButton(ui->tool_default_email, defaultEmail);
   
   //Now load the XDG mime defaults
   ui->tree_defaults->clear();
@@ -135,7 +66,7 @@ void page_defaultapps::LoadSettings(int){
   //qDebug() << "Mime List:\n" << defMimeList.join("\n");
   defMimeList.sort(); //sort by group/mime
   //Now fill the tree by group/mime
-  QTreeWidgetItem *group = new QTreeWidgetItem(0); //nothing at the moment
+  QTreeWidgetItem *group = nullptr;
   QString ccat;
   for(int i=0; i<defMimeList.length(); i++){
     //Get the info from this entry
@@ -145,37 +76,38 @@ void page_defaultapps::LoadSettings(int){
     QString def = defMimeList[i].section("::::",2,2);
     QString comment = defMimeList[i].section("::::",3,50);
     //Now check if this is a new category
-    if(ccat!=cat){
-	//New group
-	group = new QTreeWidgetItem(0);
+    if(group == nullptr || ccat!=cat){
+	    //New group
+	    group = new QTreeWidgetItem(0);
 	    group->setText(0, cat); //add translations for known/common groups later
-	ui->tree_defaults->addTopLevelItem(group);
-	ccat = cat;
+    	ui->tree_defaults->addTopLevelItem(group);
+    	ccat = cat;
     }
     //Now create the entry
     QTreeWidgetItem *it = new QTreeWidgetItem();
-      it->setWhatsThis(0,mime); // full mimetype
-      it->setText(0, QString(tr("%1 (%2)")).arg(mime.section("/",-1), extlist) );
-      it->setText(2,comment);
-      it->setToolTip(0, comment); it->setToolTip(1,comment);
-      //Now load the default (if there is one)
-      it->setWhatsThis(1,def); //save for later
-      if(def.endsWith(".desktop")){
-	XDGDesktop file(def);
-	if(file.type == XDGDesktop::BAD){
-	  //Might be a binary - just print out the raw "path"
-	  it->setText(1,def.section("/",-1));
-	  it->setIcon(1, LXDG::findIcon("application-x-executable","") );
-	}else{
-	  it->setText(1, file.name);
-	  it->setIcon(1, LXDG::findIcon(file.icon,"") );
-	}     
-      }else if(!def.isEmpty()){
-	//Binary/Other default
-	it->setText(1, def.section("/",-1));
-	it->setIcon(1, LXDG::findIcon("application-x-executable","") );
+    it->setWhatsThis(0,mime); // full mimetype
+    it->setText(0, QString(tr("%1 (%2)")).arg(mime.section("/",-1), extlist) );
+    it->setText(2,comment);
+    it->setToolTip(0, comment); it->setToolTip(1,comment);
+    //Now load the default (if there is one)
+    it->setWhatsThis(1,def); //save for later
+    it->setData(1, Qt::UserRole, def);
+    if(def.endsWith(".desktop")){
+      XDGDesktop file(def);
+      if(file.type == XDGDesktop::BAD){
+        //Might be a binary - just print out the raw "path"
+        it->setText(1, def.section("/",-1));
+        it->setIcon(1, LXDG::findIcon("application-x-executable","") );
+      }else{
+        it->setText(1, file.name);
+        it->setIcon(1, LXDG::findIcon(file.icon,"") );
       }
-      group->addChild(it);
+    }else if(!def.isEmpty()){
+      //Binary/Other default
+      it->setText(1, def.section("/",-1));
+      it->setIcon(1, LXDG::findIcon("application-x-executable","") );
+    }
+    group->addChild(it);
   }
   
   ui->tree_defaults->sortItems(0,Qt::AscendingOrder);
@@ -194,8 +126,8 @@ void page_defaultapps::updateIcons(){
 //=================
 //         PRIVATE
 //=================
-QString page_defaultapps::getSysApp(bool allowreset){
-  AppDialog dlg(this);
+QString page_defaultapps::getSysApp(bool allowreset, QString defaultPath){
+  AppDialog dlg(this, defaultPath);
     dlg.allowReset(allowreset);
     dlg.exec();
   if(dlg.appreset && allowreset){
@@ -206,6 +138,7 @@ QString page_defaultapps::getSysApp(bool allowreset){
 }
 
 void page_defaultapps::updateDefaultButton(QToolButton *button, QString app){
+  if( !QFile::exists(app) && !LUtils::isValidBinary(app) ){ qDebug() << "Invalid Settings:" << app; app.clear(); } //invalid settings
   if(app.endsWith(".desktop")){
     XDGDesktop file(app);
     if(file.type == XDGDesktop::BAD){
@@ -231,10 +164,11 @@ void page_defaultapps::updateDefaultButton(QToolButton *button, QString app){
 //=================
 void page_defaultapps::changeDefaultBrowser(){
   //Prompt for the new app
-  QString app = getSysApp(true);
-    if(app.isEmpty()){ return; }//nothing selected
-    if(app=="reset"){ app.clear(); }
+  QString app = getSysApp(true, defaultBrowser);
+  if(app.isEmpty()){ return; }//nothing selected
+  if(app=="reset"){ app.clear(); }
   //save the new app setting and adjust the button appearance
+  defaultBrowser = app;
   LXDG::setDefaultAppForMime("x-scheme-handler/http", app.section("/",-1));
   LXDG::setDefaultAppForMime("x-scheme-handler/https", app.section("/",-1));
   updateDefaultButton(ui->tool_default_webbrowser, app);
@@ -242,30 +176,33 @@ void page_defaultapps::changeDefaultBrowser(){
 
 void page_defaultapps::changeDefaultEmail(){
   //Prompt for the new app
-  QString app = getSysApp(true);
-    if(app.isEmpty()){ return; }//nothing selected
-    if(app=="reset"){ app.clear(); }
+  QString app = getSysApp(true, defaultEmail);
+  if(app.isEmpty()){ return; }//nothing selected
+  if(app=="reset"){ app.clear(); }
   //save the new app setting and adjust the button appearance
+  defaultEmail = app;
   LXDG::setDefaultAppForMime("application/email",app.section("/",-1));
   updateDefaultButton(ui->tool_default_email, app);
 }
 
 void page_defaultapps::changeDefaultFileManager(){
   //Prompt for the new app
-  QString app = getSysApp(true);
-    if(app.isEmpty()){ return; }//nothing selected
-    if(app=="reset"){ app = "lumina-fm"; }
+  QString app = getSysApp(true, defaultFileManager);
+  if(app.isEmpty()){ return; }//nothing selected
+  if(app=="reset"){ app = "lumina-fm"; }
   //save the new app setting and adjust the button appearance
+  defaultFileManager = app;
   LXDG::setDefaultAppForMime("inode/directory", app.section("/",-1));
   updateDefaultButton(ui->tool_default_filemanager, app);
 }
 
 void page_defaultapps::changeDefaultTerminal(){
   //Prompt for the new app
-  QString app = getSysApp(true);
-    if(app.isEmpty()){ return; }//nothing selected
-    if(app=="reset"){ app = "xterm"; }
+  QString app = getSysApp(true, defaultTerminal);
+  if(app.isEmpty()){ return; }//nothing selected
+  if(app=="reset"){ app = "xterm"; }
   //save the new app setting and adjust the button appearance
+  defaultTerminal = app;
   LXDG::setDefaultAppForMime("application/terminal", app.section("/",-1) );
   updateDefaultButton(ui->tool_default_terminal, app);
 }
@@ -292,14 +229,19 @@ void page_defaultapps::cleardefaultitem(){
 
 void page_defaultapps::setdefaultitem(){
   QTreeWidgetItem *it = ui->tree_defaults->currentItem();
+  QString path;
   if(it==0){ return; } //no item selected
   QList<QTreeWidgetItem*> list;
   for(int i=0; i<it->childCount(); i++){
     list << it->child(i);
   }
-  if(list.isEmpty()){ list << it; } //just do the current item
+  if(list.isEmpty()){
+    //just do the current item
+    list << it;
+    path = it->data(1, Qt::UserRole).toString();
+  }
   //Prompt for which application to use
-  QString app = getSysApp(false); //no "reset"  option
+  QString app = getSysApp(false, path); //no "reset"  option
     if(app.isEmpty()){ return; }//nothing selected
   //Now set the items
   for(int i=0; i<list.length(); i++){
@@ -310,6 +252,7 @@ void page_defaultapps::setdefaultitem(){
     list[i]->setWhatsThis(1,app); //app path
     list[i]->setIcon(1,LXDG::findIcon(desk.icon,"")); //reset the icon
     list[i]->setText(1,desk.name); //reset the name
+    list[i]->setData(1, Qt::UserRole, app);
   }
 
 }
diff --git a/src-qt5/core-utils/lumina-config/pages/page_defaultapps.h b/src-qt5/core-utils/lumina-config/pages/page_defaultapps.h
index f80ea1ab..d8e2bcde 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_defaultapps.h
+++ b/src-qt5/core-utils/lumina-config/pages/page_defaultapps.h
@@ -26,8 +26,12 @@ public slots:
 
 private:
 	Ui::page_defaultapps *ui;
+  QString defaultBrowser;
+  QString defaultEmail;
+  QString defaultFileManager;
+  QString defaultTerminal;
 
-	QString getSysApp(bool allowreset);
+	QString getSysApp(bool allowreset, QString defaultPath = "");
 
 	void updateDefaultButton(QToolButton *button, QString app);
 
diff --git a/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp b/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp
index 827061af..3c355aa7 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp
+++ b/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp
@@ -21,6 +21,13 @@ page_interface_panels::page_interface_panels(QWidget *parent) : PageWidget(paren
   connect(ui->tool_panels_add, SIGNAL(clicked()), this, SLOT(newPanel()) );
   updateIcons();
   setupProfiles();
+
+  //Create panels container
+  QHBoxLayout *panels_layout = new QHBoxLayout();
+  panels_layout->setContentsMargins(0,0,0,0);
+  panels_layout->setAlignment(Qt::AlignLeft);
+  panels_layout->addStretch();
+  ui->scroll_panels->widget()->setLayout(panels_layout);
 }
 
 page_interface_panels::~page_interface_panels(){
@@ -53,28 +60,30 @@ void page_interface_panels::LoadSettings(int screennum){
   QString screenID = QApplication::screens().at(cscreen)->name();
   QString DPrefix = "desktop-"+screenID+"/";
   int panelnumber = settings->value(DPrefix+"panels",-1).toInt();
+  QBoxLayout *panels_layout = static_cast<QHBoxLayout*>(ui->scroll_panels->widget()->layout());
   
-//First clean any current panels
-  for(int i=0; i<PANELS.length(); i++){ delete PANELS.takeAt(i); i--; }
-  //Now create new panels
-  if(ui->scroll_panels->widget()->layout()==0){ 
-    ui->scroll_panels->widget()->setLayout( new QHBoxLayout() ); 
-    ui->scroll_panels->widget()->layout()->setContentsMargins(0,0,0,0);
+  //Remove extra panels (if any)
+  for(int i=panelnumber; i<PANELS.length(); i++){
+    PanelWidget *tmp = PANELS.takeAt(i);
+    delete tmp;
+    i--;
   }
-  ui->scroll_panels->widget()->layout()->setAlignment(Qt::AlignLeft);
-  //Clear anything left over in the layout
-  for(int i=0; i<ui->scroll_panels->widget()->layout()->count(); i++){
-    delete ui->scroll_panels->widget()->layout()->takeAt(i);
+
+  int current_count = panels_layout->count()-1;
+
+  //Update current panels
+  for(int i=0; i<current_count; i++) {
+    PANELS[i]->LoadSettings(settings, cscreen, i);
   }
-  for(int i=0; i<panelnumber; i++){
+  //Create new panels
+  for(int i=current_count; i<panelnumber; i++){
     PanelWidget *tmp = new PanelWidget(ui->scroll_panels->widget(), this, PINFO);
     tmp->LoadSettings(settings, cscreen, i);
     PANELS << tmp;
     connect(tmp, SIGNAL(PanelChanged()), this, SLOT(panelValChanged()) );
     connect(tmp, SIGNAL(PanelRemoved(int)), this, SLOT(removePanel(int)) );
-    ui->scroll_panels->widget()->layout()->addWidget(tmp);
+    panels_layout->insertWidget(panels_layout->count()-1, tmp);
   }
-  static_cast<QHBoxLayout*>(ui->scroll_panels->widget()->layout())->addStretch();
 
   QApplication::processEvents();
   loading = false;
diff --git a/src-qt5/core-utils/lumina-config/pages/page_mouse.cpp b/src-qt5/core-utils/lumina-config/pages/page_mouse.cpp
deleted file mode 100644
index f4eebd0e..00000000
--- a/src-qt5/core-utils/lumina-config/pages/page_mouse.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-//===========================================
-//  Lumina Desktop Source Code
-//  Copyright (c) 2016, Ken Moore
-//  Available under the 3-clause BSD license
-//  See the LICENSE file for full details
-//===========================================
-#include "page_mouse.h"
-#include "ui_page_mouse.h"
-#include "getPage.h"
-
-#include <QSpinBox>
-#include <QDoubleSpinBox>
-
-//==========
-//    PUBLIC
-//==========
-page_mouse::page_mouse(QWidget *parent) : PageWidget(parent), ui(new Ui::page_mouse()){
-  ui->setupUi(this);
-  devices = LInput::listDevices();
-   //DEBUG Code
-    /*qDebug() << "List Devices:";
-    for(int i=0; i<devices.length(); i++){
-      if(!devices[i]->isPointer()){
-        ::free( devices.takeAt(i));
-        i--;
-      }else{
-        qDebug() << "Found Pointer:" << devices[i]->devNumber();
-        qDebug() << " - isExtension:" << devices[i]->isExtension();
-        QList<int> props = devices[i]->listProperties();
-        qDebug() << " - Properties:";
-        for(int j=0; j<props.length(); j++){
-          qDebug() << "   --" <<devices[i]->propertyName(props[j])+" ("+QString::number(props[j])+")" <<" = " << devices[i]->getPropertyValue(props[j]);
-        }
-      }
-    }*/
-  generateUI();
-}
-
-page_mouse::~page_mouse(){
-  for(int i=0; i<devices.length(); i++){ ::free(devices[i]); }
-}
-
-//================
-//    PUBLIC SLOTS
-//================
-void page_mouse::SaveSettings(){
-
-  emit HasPendingChanges(false);
-}
-
-void page_mouse::LoadSettings(int){
-  emit HasPendingChanges(false);
-  emit ChangePageTitle( tr("Input Device Settings") );
-
-}
-
-void page_mouse::updateIcons(){
-  for(int i=0; i<ui->tabWidget->count(); i++){
-    ui->tabWidget->setTabIcon( i, LXDG::findIcon( "input-"+ui->tabWidget->tabWhatsThis(i).section(":",0,0), "" ) );
-  }
-}
-
-//=================
-//         PRIVATE 
-//=================
-void page_mouse::generateUI(){
-  ui->tabWidget->clear(); //remove all tabs (just in case)
-  int mouse = 1;
-  int keyboard = 1;
-  qDebug() << "Devices Found:" << devices.length();
-  for(int i=0; i<devices.length(); i++){
-    QTreeWidget *tree = 0;
-    if(!devices[i]->isExtension() || devices[i]->isPointer()){
-      if(devices[i]->isPointer() && devices[i]->listProperties().count() <4){ continue; } //filter out all the trivial/static mouse devices
-      //Make a new tab for this device
-      tree = new QTreeWidget(this);
-      tree->setHeaderHidden(true);
-      tree->setColumnCount(2);
-      connect(tree, SIGNAL(itemActivated(QTreeWidgetItem*, int)), this, SLOT(itemClicked(QTreeWidgetItem*,int)) );
-      if(devices[i]->isPointer()){ 
-        int tab = ui->tabWidget->addTab(tree, LXDG::findIcon("input-mouse",""), QString(tr("Mouse #%1")).arg(QString::number(mouse)) ); 
-        ui->tabWidget->setTabWhatsThis(tab, "mouse:"+QString::number(devices[i]->devNumber()));
-        mouse++;
-      }else{  
-        int tab = ui->tabWidget->addTab(tree, LXDG::findIcon("input-keyboard",""), QString(tr("Keyboard #%1")).arg(QString::number(keyboard)) ); 
-        ui->tabWidget->setTabWhatsThis(tab, "keyboard:"+QString::number(devices[i]->devNumber()) );
-        keyboard++;
-      }
-    }else{
-      //Find the associated tab for this extension device
-      int tab = 0;
-      QString type = devices[i]->isPointer() ? "mouse" : "keyboard";
-      int num = devices[i]->devNumber();
-      for(int t=ui->tabWidget->count()-1; t>0; t--){
-        if(ui->tabWidget->tabWhatsThis(t).startsWith(type) && ui->tabWidget->tabWhatsThis(t).section(":",-1).toInt() < num ){ tab = t; break; }
-      }
-      tree = static_cast<QTreeWidget*>( ui->tabWidget->widget(tab) );
-    }
-    if(tree!=0){ populateDeviceTree(tree, devices[i]); }
-  }
-}
-
-void page_mouse::populateDeviceTree(QTreeWidget *tree, LInputDevice *device){
- QTreeWidgetItem *top = new QTreeWidgetItem(tree);
-  if(device->isExtension()){ 
-    top->setText( 0, QString(tr("Extension Device #%1")).arg(QString::number(tree->topLevelItemCount())) );
-  }else{  top->setText(0, tr("Master Device")); }
-  top->setWhatsThis(0, QString(device->isPointer() ? "mouse" : "keyboard")+":"+QString::number(device->devNumber()) ); //save this for later
-  top->setFirstColumnSpanned(true);
-  top->setExpanded(true);
-  tree->addTopLevelItem(top);
-  //Now add all the child properties to this item
-  QList<int> props = device->listProperties();
-  for(int i=0; i<props.length(); i++){
-    if(device->propertyName(props[i]).toLower().contains("matrix")){ continue; } //skip this one - can not change from UI and most people will never want to anyway
-    QTreeWidgetItem *tmp = new QTreeWidgetItem(top);
-      tmp->setWhatsThis(0, QString::number(props[i]) );
-      tmp->setText(0, device->propertyName(props[i]));
-      top->addChild(tmp);
-      populateDeviceItemValue(tree, tmp, device->getPropertyValue(props[i]), QString::number(device->devNumber())+":"+QString::number(props[i]) );     
-  }
-  //Clean up the tree widget as needed
-  top->sortChildren(0, Qt::AscendingOrder);
-  tree->resizeColumnToContents(0);
-}
-
-void page_mouse::populateDeviceItemValue(QTreeWidget *tree, QTreeWidgetItem *it, QVariant value, QString id){
-  if(value.type()==QVariant::Int){
-    //Could be a boolian - check the name for known "enable" states
-    if(value.toInt() < 2 && (it->text(0).toLower().contains("enable") || it->text(0).toLower().contains("emulation") || it->text(0)==("XTEST Device") ) ){
-      //Just use a checkable column within the item
-      bool enabled = (value.toInt()==1);
-      it->setText(1,"");
-      it->setWhatsThis(1, "bool:"+id);
-      it->setCheckState(1, enabled ? Qt::Checked : Qt::Unchecked);
-    }else{
-      //Use a QSpinBox
-      QSpinBox *box = new QSpinBox();
-        box->setRange(0,100);
-        box->setValue( value.toInt() );
-	box->setWhatsThis("int:"+id);
-      tree->setItemWidget(it, 1, box);
-      connect(box, SIGNAL(valueChanged(int)), this, SLOT(valueChanged()) );
-    }
-  }else if(value.type()==QVariant::Double){
-  //Use a QDoubleSpinBox
-  QDoubleSpinBox *box = new QDoubleSpinBox();
-      box->setRange(0,1000);
-      box->setValue( value.toInt() );
-      box->setWhatsThis("double:"+id);
-    tree->setItemWidget(it, 1, box);
-    connect(box, SIGNAL(valueChanged(double)), this, SLOT(valueChanged()) );
-
-  }else if(value.canConvert< QList<QVariant> >()){
-    //Not Modifiable - just use the label in the item
-    QList<QVariant> list = value.toList();
-    QStringList txtList;
-    for(int i=0; i<list.length(); i++){ txtList << list[i].toString(); }
-    it->setText(1, txtList.join(", ") );
-    it->setToolTip(1, txtList.join(", "));
-  }else if( value.canConvert<QString>() ){
-    //Not Modifiable - just use the label in the item
-    it->setText(1, value.toString());
-  }
-}
-//=================
-//    PRIVATE SLOTS
-//=================
-void page_mouse::valueChanged(){
-  //Now get the currently focused widget
-   QWidget *foc = this->focusWidget();
-   if(foc==0){ return; }
-  //qDebug() << "Focus Widget:" << foc->whatsThis();
-  //Now pull out the value and device/property numbers
-  unsigned int dev = foc->whatsThis().section(":",1,1).toInt();
-  int prop = foc->whatsThis().section(":",2,2).toInt();
-  QVariant value;
-  if(foc->whatsThis().startsWith("int:")){ value.setValue( static_cast<QSpinBox*>(foc)->value() ); }
-  else if(foc->whatsThis().startsWith("double:")){ value.setValue( static_cast<QDoubleSpinBox*>(foc)->value() ); }
-  //Now change the property for the device
-  qDebug() << " - Device:" <<dev << "prop:" << prop << "value:" << value;
-  for(int i=0; i<devices.length(); i++){
-    if(devices[i]->devNumber() == dev){
-      bool ok = devices[i]->setPropertyValue(prop, value);
-      if(ok){ foc->setStyleSheet(""); }
-      else{ foc->setStyleSheet("background: red"); }
-      //qDebug() << " - Changed property:" << (ok ? "success" : "failure");
-      break;
-    }
-  }
-}
-
-void page_mouse::itemClicked(QTreeWidgetItem *it, int col){
-  if(col!=1){ return; } //only care about value changes
-  if(it->whatsThis(1).isEmpty()){ return; }//not a checkable item
-  qDebug() << "item Clicked:" << it->whatsThis(1) << it->text(0);
-  //Now pull out the value and device/property numbers
-  unsigned int dev = it->whatsThis(1).section(":",1,1).toInt();
-  int prop = it->whatsThis(1).section(":",2,2).toInt();
-  QVariant value( (it->checkState(1)==Qt::Checked) ? 1 : 0 );
- //Now change the property for the device
-  qDebug() << " - Device:" <<dev << "prop:" << prop << "value:" << value;
-  for(int i=0; i<devices.length(); i++){
-    if(devices[i]->devNumber() == dev){
-      //Since this "clicked" signal can get sent out even if the value has not changed, go ahead and make sure we have a different value first
-      QVariant current = devices[i]->getPropertyValue(prop);
-      //qDebug() << " - Current Value:" << current;
-      if(value.toInt()!=current.toInt()){
-        bool ok = devices[i]->setPropertyValue(prop, value);
-        //if(ok){ foc->setStyleSheet(""); }
-        //else{ foc->setStyleSheet("background: red"); }
-        qDebug() << " - Changed property:" << (ok ? "success" : "failure");
-      }
-      break;
-    }
-  }
-}
diff --git a/src-qt5/core-utils/lumina-config/pages/page_mouse.h b/src-qt5/core-utils/lumina-config/pages/page_mouse.h
deleted file mode 100644
index 5409a9c2..00000000
--- a/src-qt5/core-utils/lumina-config/pages/page_mouse.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//===========================================
-//  Lumina Desktop Source Code
-//  Copyright (c) 2016, Ken Moore
-//  Available under the 3-clause BSD license
-//  See the LICENSE file for full details 
-//===========================================
-#ifndef _LUMINA_CONFIG_PAGE_MOUSE_H
-#define _LUMINA_CONFIG_PAGE_MOUSE_H
-#include "../globals.h"
-#include "PageWidget.h"
-
-#include <LInputDevice.h>
-#include <QTreeWidgetItem>
-
-namespace Ui{
-       class page_mouse;
-};
-
-class page_mouse : public PageWidget{
-	Q_OBJECT
-public:
-       page_mouse(QWidget *parent);
-       ~page_mouse();
-
-public slots:
-	void SaveSettings();
-	void LoadSettings(int screennum);
-	void updateIcons();
-
-private:
-       Ui::page_mouse *ui;
-	QList<LInputDevice*> devices;
-
-	void generateUI();
-	void populateDeviceTree(QTreeWidget *tree, LInputDevice *device);
-	void populateDeviceItemValue(QTreeWidget *tree, QTreeWidgetItem *it, QVariant value, QString id);
-
-private slots:
-	void valueChanged();
-	void itemClicked(QTreeWidgetItem*, int);
-
-};
-#endif
diff --git a/src-qt5/core-utils/lumina-config/pages/page_mouse.ui b/src-qt5/core-utils/lumina-config/pages/page_mouse.ui
deleted file mode 100644
index a6c2e53f..00000000
--- a/src-qt5/core-utils/lumina-config/pages/page_mouse.ui
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>page_mouse</class>
- <widget class="QWidget" name="page_mouse">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="iconSize">
-      <size>
-       <width>32</width>
-       <height>32</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src-qt5/core-utils/lumina-config/pages/pages.pri b/src-qt5/core-utils/lumina-config/pages/pages.pri
index 0ee5d561..89b9b010 100644
--- a/src-qt5/core-utils/lumina-config/pages/pages.pri
+++ b/src-qt5/core-utils/lumina-config/pages/pages.pri
@@ -51,9 +51,3 @@ FORMS	+=	$${PWD}/page_main.ui \
 		$${PWD}/page_compton.ui
 #		$${PWD}/page_bluetooth_trueos.ui 
 #   $${PWD}/page_mouse_trueos.ui 
-
-!NO_XINPUT{
-  HEADERS += $${PWD}/page_mouse.h
-  SOURCES += $${PWD}/page_mouse.cpp
-  FORMS += $${PWD}/page_mouse.ui
-}
diff --git a/src-qt5/core-utils/lumina-search/i18n/lumina-search_da.ts b/src-qt5/core-utils/lumina-search/i18n/lumina-search_da.ts
index cdf95b44..2c750640 100644
--- a/src-qt5/core-utils/lumina-search/i18n/lumina-search_da.ts
+++ b/src-qt5/core-utils/lumina-search/i18n/lumina-search_da.ts
@@ -74,12 +74,12 @@
     <message>
         <location filename="../MainUI.ui" line="88"/>
         <source>Close</source>
-        <translation>Afslut</translation>
+        <translation>Luk</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="108"/>
         <source>Launch Item</source>
-        <translation>Startenhed</translation>
+        <translation>Start post</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="119"/>
@@ -149,7 +149,7 @@
     <message>
         <location filename="../Worker.cpp" line="112"/>
         <source>Search Finished</source>
-        <translation>Søgning afsluttet</translation>
+        <translation>Søgning gennemført</translation>
     </message>
 </context>
 </TS>