9 files changed, 18 insertions, 2 deletions
diff --git a/libLumina/LuminaOS-Debian.cpp b/libLumina/LuminaOS-Debian.cpp
index 0ba367e2..8228d7c4 100644
--- a/libLumina/LuminaOS-Debian.cpp
+++ b/libLumina/LuminaOS-Debian.cpp
@@ -13,6 +13,8 @@
 //can't read xbrightness settings - assume invalid until set
 static int screenbrightness = -1;
 
+QString LOS::OSName(){ return "Debian GNU/Linux"; }
+
 //OS-specific prefix(s)
 QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/"; } //Prefix for system
@@ -20,7 +22,7 @@ QString LOS::SysPrefix(){ return "/"; } //Prefix for system
 //OS-specific application shortcuts (*.desktop files)
 QString LOS::ControlPanelShortcut(){ return ""; } //system control panel
 QString LOS::AppStoreShortcut(){ return LOS::AppPrefix() + "/share/applications/synaptic.desktop"; } //graphical app/pkg manager
-QString LOS::QtConfigShortcut(){ return LOS::AppPrefix() + "/bin/qtconfig"; } //qtconfig binary (NOT *.desktop file)
+QString LOS::QtConfigShortcut(){ return LOS::AppPrefix() + "/bin/qt5ct"; } //qtconfig binary (NOT *.desktop file)
 
 // ==== ExternalDevicePaths() ====
 QStringList LOS::ExternalDevicePaths(){
diff --git a/libLumina/LuminaOS-DragonFly.cpp b/libLumina/LuminaOS-DragonFly.cpp
index 6d59f0d7..dd9320fc 100644
--- a/libLumina/LuminaOS-DragonFly.cpp
+++ b/libLumina/LuminaOS-DragonFly.cpp
@@ -11,6 +11,8 @@
 //can't read xbrightness settings - assume invalid until set
 static int screenbrightness = -1;
 
+QString LOS::OSName(){ return "DragonFly BSD"; }
+
 //OS-specific prefix(s)
 QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
diff --git a/libLumina/LuminaOS-FreeBSD.cpp b/libLumina/LuminaOS-FreeBSD.cpp
index 87be7937..8b395026 100644
--- a/libLumina/LuminaOS-FreeBSD.cpp
+++ b/libLumina/LuminaOS-FreeBSD.cpp
@@ -11,6 +11,7 @@
 //can't read xbrightness settings - assume invalid until set
 static int screenbrightness = -1;
 
+QString LOS::OSName(){ return "FreeBSD"; }
 
 //OS-specific prefix(s)
 QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
@@ -29,6 +30,7 @@ QStringList LOS::ExternalDevicePaths(){
   //Now check the output
   for(int i=0; i<devs.length(); i++){
     if(devs[i].startsWith("/dev/")){
+      devs[i].replace("\t"," ");
       QString type = devs[i].section(" on ",0,0);
 	type.remove("/dev/");
       //Determine the type of hardware device based on the dev node
diff --git a/libLumina/LuminaOS-Linux.cpp b/libLumina/LuminaOS-Linux.cpp
index aaf781fb..f0f427f4 100644
--- a/libLumina/LuminaOS-Linux.cpp
+++ b/libLumina/LuminaOS-Linux.cpp
@@ -13,6 +13,8 @@
 //can't read xbrightness settings - assume invalid until set
 static int screenbrightness = -1;
 
+QString LOS::OSName(){ return "Linux"; }
+
 //OS-specific prefix(s)
 QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
diff --git a/libLumina/LuminaOS-OpenBSD.cpp b/libLumina/LuminaOS-OpenBSD.cpp
index a4d3a64b..ffc21fa4 100644
--- a/libLumina/LuminaOS-OpenBSD.cpp
+++ b/libLumina/LuminaOS-OpenBSD.cpp
@@ -12,6 +12,7 @@
 //can't read xbrightness settings - assume invalid until set
 static int screenbrightness = -1;
 
+QString LOS::OSName(){ return "OpenBSD"; }
 
 //OS-specific prefix(s)
 QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
diff --git a/libLumina/LuminaOS-kFreeBSD.cpp b/libLumina/LuminaOS-kFreeBSD.cpp
index 7a5f783e..ab9f9827 100644
--- a/libLumina/LuminaOS-kFreeBSD.cpp
+++ b/libLumina/LuminaOS-kFreeBSD.cpp
@@ -17,6 +17,8 @@
 //can't read xbrightness settings - assume invalid until set
 static int screenbrightness = -1;
 
+QString LOS::OSName(){ return "Debian GNU/kFreeBSD"; }
+
 //OS-specific prefix(s)
 QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
diff --git a/libLumina/LuminaOS-template.cpp b/libLumina/LuminaOS-template.cpp
index b975d5a1..d481984f 100644
--- a/libLumina/LuminaOS-template.cpp
+++ b/libLumina/LuminaOS-template.cpp
@@ -9,6 +9,8 @@
 #include <unistd.h>
 #include <stdio.h> // Needed for BUFSIZ
 
+QString LOS::OSName(){ return "Sample"; }
+
 //OS-specific prefix(s)
 QString LOS::AppPrefix(){ return "/usr/local/"; } //Prefix for applications
 QString LOS::SysPrefix(){ return "/usr/"; } //Prefix for system
diff --git a/libLumina/LuminaOS.h b/libLumina/LuminaOS.h
index 7bf0e923..e0eb2895 100644
--- a/libLumina/LuminaOS.h
+++ b/libLumina/LuminaOS.h
@@ -31,6 +31,9 @@
 
 class LOS{
 public:
+	//Return the name of the OS being used
+	static QString OSName(); 
+
 	//OS-specific prefix(s)
 	static QString LuminaShare(){ return (PREFIX+"/share/Lumina-DE/"); } //Install dir for Lumina share files
 	static QString AppPrefix(); //Prefix for applications (/usr/local/ on FreeBSD)
diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp
index fb2e31bd..488af6a8 100644
--- a/libLumina/LuminaUtils.cpp
+++ b/libLumina/LuminaUtils.cpp
@@ -21,7 +21,7 @@
 //  LUtils Functions
 //=============
 QString LUtils::LuminaDesktopVersion(){ 
-  return "0.8.1"; 
+  return "0.8.2-devel"; 
 }
 
 int LUtils::runCmd(QString cmd, QStringList args){