3 files changed, 16 insertions, 28 deletions

diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp
index 89dc72a4..f9baac9b 100644
--- a/libLumina/LuminaUtils.cpp
+++ b/libLumina/LuminaUtils.cpp
@@ -78,6 +78,7 @@ bool LUtils::writeFile(QString filepath, QStringList contents, bool overwrite){
   QFile file(filepath);
   if(file.exists() && !overwrite){ return false; }
   bool ok = false;
+  if(contents.isEmpty()){ contents << "\n"; }
   if( file.open(QIODevice::WriteOnly | QIODevice::Truncate) ){
     QTextStream out(&file);
     out << contents.join("\n");
@@ -202,6 +203,7 @@ QStringList LUtils::listFavorites(){
   QDateTime cur = QDateTime::currentDateTime();
   if(lastRead.isNull() || lastRead<QFileInfo(QDir::homePath()+"/.lumina/favorites/fav.list").lastModified()){
     fav = LUtils::readFile(QDir::homePath()+"/.lumina/favorites/fav.list");
+    fav.removeAll(""); //remove any empty lines
     lastRead = cur;
     if(fav.isEmpty()){
       //Make sure the favorites dir exists, and create it if necessary
diff --git a/libLumina/themes/Lumina-default.qss.template b/libLumina/themes/Lumina-default.qss.template
index b8ea28da..ed02b310 100644
--- a/libLumina/themes/Lumina-default.qss.template
+++ b/libLumina/themes/Lumina-default.qss.template
@@ -16,23 +16,14 @@ QWidget#LuminaBootSplash{
 }
 
 /* Set the default canvas appearance for Lumina desktop plugins*/
-LDPlugin#audioplayer{
+/* Default to a non-transparent background for all desktop plugins*/
+LDPlugin{
   background: %%BASECOLOR%%;
   border-radius: 5px;
 }
-
-LDPlugin#calendar{
-  background: %%BASECOLOR%%;
-  border-radius: 5px;
-}
-
-LDPlugin#notepad{
-  background: %%BASECOLOR%%;
-  border-radius: 5px;
-}
-
-LDPlugin#systemmonitor{
-  background: %%BASECOLOR%%;
+/* Now specify which plugins should have a transparent background */
+LDPlugin#applauncher, LDPlugin#desktopview{
+  background: transparent;
   border-radius: 5px;
 }
 
@@ -41,11 +32,13 @@ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
   stop: 0 transparent, 
   stop: 0.7 transparent,
   stop: 1.0 %%PRIMARYDISABLECOLOR%%);
+  border: none;
   border-radius: 5px; 
   color: %%TEXTCOLOR%%;
 }
 LDPlugin#applauncher  QToolButton:hover{
   background: %%PRIMARYDISABLECOLOR%%;
+  border: none;
   border-radius: 5px; 
   color: %%TEXTHIGHLIGHTCOLOR%%;
 }
diff --git a/libLumina/themes/None.qss.template b/libLumina/themes/None.qss.template
index 57dd84e4..430bd44b 100644
--- a/libLumina/themes/None.qss.template
+++ b/libLumina/themes/None.qss.template
@@ -14,23 +14,14 @@ QWidget#LuminaBootSplash{
 }
 
 /* Set the default canvas appearance for Lumina desktop plugins*/
-LDPlugin#audioplayer{
+/* Default to a non-transparent background for all desktop plugins*/
+LDPlugin{
   background: %%BASECOLOR%%;
   border-radius: 5px;
 }
-
-LDPlugin#calendar{
-  background: %%BASECOLOR%%;
-  border-radius: 5px;
-}
-
-LDPlugin#notepad{
-  background: %%BASECOLOR%%;
-  border-radius: 5px;
-}
-
-LDPlugin#systemmonitor{
-  background: %%BASECOLOR%%;
+/* Now specify which plugins should have a transparent background */
+LDPlugin#applauncher, LDPlugin#desktopview{
+  background: transparent;
   border-radius: 5px;
 }
 
@@ -39,11 +30,13 @@ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
   stop: 0 transparent, 
   stop: 0.7 transparent,
   stop: 1.0 %%PRIMARYDISABLECOLOR%%);
+  border: none;
   border-radius: 5px; 
   color: %%TEXTCOLOR%%;
 }
 LDPlugin#applauncher  QToolButton:hover{
   background: %%PRIMARYDISABLECOLOR%%;
+  border: none;
   border-radius: 5px; 
   color: %%TEXTHIGHLIGHTCOLOR%%;
 }