diff --git a/config/helpers.h b/config/helpers.h
index 128a4db..8d54fcb 100644
--- a/config/helpers.h
+++ b/config/helpers.h
@@ -1,9 +1,10 @@
 /*
- * File:   Settings.h
- * Author: christian
- *
- * Created on 15. februar 2014, 11:44
- */
+* Copyright (c) 2014 Christian Surlykke
+*
+* This file is part of the LXQt project. <http://lxqt.org>
+* It is distributed under the LGPL 2.1 or later license.
+* Please refer to the LICENSE file for a copy of the license.
+*/
 #ifndef POWER_MANAGEMENT_SETTINGS_H
 #define	POWER_MANAGEMENT_SETTINGS_H
 
diff --git a/config/lxqt-config-powermanagement.desktop.in b/config/lxqt-config-powermanagement.desktop.in
index 14d77fd..7955ace 100644
--- a/config/lxqt-config-powermanagement.desktop.in
+++ b/config/lxqt-config-powermanagement.desktop.in
@@ -6,6 +6,6 @@ Comment=Various settings regarding Power Management like battery or idleness wat
 Exec=lxqt-config-powermanagement
 Icon=preferences-system-power-management
 Categories=Settings;DesktopSettings;Qt;LXQt;
-OnlyShowIn=LXQt;LXDE;
+OnlyShowIn=LXQt;
 
 #TRANSLATIONS_DIR=translations
diff --git a/src/batteryinfodialog.cpp b/src/batteryinfodialog.cpp
index 3794553..a6c9a9a 100644
--- a/src/batteryinfodialog.cpp
+++ b/src/batteryinfodialog.cpp
@@ -1,3 +1,11 @@
+/*
+* Copyright (c) 2014 Christian Surlykke
+*
+* This file is part of the LXQt project. <http://lxqt.org>
+* It is distributed under the LGPL 2.1 or later license.
+* Please refer to the LICENSE file for a copy of the license.
+*/
+
 #include "batteryinfodialog.h"
 #include "ui_batteryinfodialog.h"
 
diff --git a/src/batteryinfodialog.h b/src/batteryinfodialog.h
index eb2afb8..c512060 100644
--- a/src/batteryinfodialog.h
+++ b/src/batteryinfodialog.h
@@ -1,3 +1,11 @@
+/*
+* Copyright (c) 2014 Christian Surlykke
+*
+* This file is part of the LXQt project. <http://lxqt.org>
+* It is distributed under the LGPL 2.1 or later license.
+* Please refer to the LICENSE file for a copy of the license.
+*/
+
 #ifndef BATTERYINFODIALOG_H
 #define BATTERYINFODIALOG_H
 
diff --git a/src/iconproducer.cpp b/src/iconproducer.cpp
index f19dbde..6fcf751 100644
--- a/src/iconproducer.cpp
+++ b/src/iconproducer.cpp
@@ -1,3 +1,10 @@
+/*
+* Copyright (c) 2014, 2015 Christian Surlykke, Paulo Lieuthier 
+*
+* This file is part of the LXQt project. <http://lxqt.org>
+* It is distributed under the LGPL 2.1 or later license.
+* Please refer to the LICENSE file for a copy of the license.
+*/
 #include "iconproducer.h"
 #include <LXQt/Settings>
 #include <XdgIcon>
diff --git a/src/iconproducer.h b/src/iconproducer.h
index f80857f..4e5d166 100644
--- a/src/iconproducer.h
+++ b/src/iconproducer.h
@@ -1,3 +1,11 @@
+/*
+* Copyright (c) 2014 Christian Surlykke
+*
+* This file is part of the LXQt project. <http://lxqt.org>
+* It is distributed under the LGPL 2.1 or later license.
+* Please refer to the LICENSE file for a copy of the license.
+*/
+
 #ifndef ICONPRODUCER_H
 #define ICONPRODUCER_H
 #include <QString>
diff --git a/src/lid.cpp b/src/lid.cpp
index 05338eb..35216c4 100644
--- a/src/lid.cpp
+++ b/src/lid.cpp
@@ -34,22 +34,25 @@
 
 Lid::Lid()
 {
-    mUPowerInterface = new QDBusInterface("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower",
-                                QDBusConnection::systemBus(), this);
-    mUPowerPropertiesInterface = new QDBusInterface("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties",
+    mUPowerInterface = new QDBusInterface("org.freedesktop.UPower",
+                                          "/org/freedesktop/UPower",
+                                          "org.freedesktop.UPower",
                                           QDBusConnection::systemBus(), this);
-    if (! connect(mUPowerInterface, SIGNAL(Changed()), this, SLOT(uPowerChange())))
-	{
-		qDebug() << "Could not connect to org.freedesktop.UPower.changed(), connecting to org.freedesktop.DBus.Properties.PropertiesChanged(..) instead";
-		QDBusConnection::systemBus().connect("org.freedesktop.UPower",
-											"/org/freedesktop/UPower",
-											"org.freedesktop.DBus.Properties",
-											"PropertiesChanged",
-											this,
-											SLOT(uPowerChange()));
-	}
 
-	mIsClosed = mUPowerPropertiesInterface->property("LidIsClosed").toBool();
+    mUPowerPropertiesInterface = new QDBusInterface("org.freedesktop.UPower",
+                                                    "/org/freedesktop/UPower",
+                                                    "org.freedesktop.DBus.Properties",
+                                                    QDBusConnection::systemBus(), this);
+
+    if (!QDBusConnection::systemBus().connect("org.freedesktop.UPower",
+                                        "/org/freedesktop/UPower",
+                                        "org.freedesktop.DBus.Properties",
+                                        "PropertiesChanged",
+                                        this,
+                                        SLOT(uPowerChange())))
+        qDebug() << "Could not connect to org.freedesktop.DBus.Properties.PropertiesChanged()";
+
+    mIsClosed = mUPowerPropertiesInterface->property("LidIsClosed").toBool();
 }
 
 bool Lid::haveLid()
@@ -62,7 +65,6 @@ bool Lid::onBattery()
     return mUPowerInterface->property("OnBattery").toBool();
 }
 
-
 void Lid::uPowerChange()
 {
     bool newIsClosed = mUPowerInterface->property("LidIsClosed").toBool();
diff --git a/src/powermanagementd.h b/src/powermanagementd.h
index 508f71c..ce1c397 100644
--- a/src/powermanagementd.h
+++ b/src/powermanagementd.h
@@ -1,9 +1,10 @@
 /*
- * File:   powermanagementd.h
- * Author: Christian Surlykke
- *
- * Created on 9. februar 2014, 16:15
- */
+* Copyright (c) 2014 Christian Surlykke
+*
+* This file is part of the LXQt project. <http://lxqt.org>
+* It is distributed under the LGPL 2.1 or later license.
+* Please refer to the LICENSE file for a copy of the license.
+*/
 
 #ifndef POWERMANAGEMENTD_H
 #define	POWERMANAGEMENTD_H
diff --git a/src/watcher.h b/src/watcher.h
index a86f810..73a6226 100644
--- a/src/watcher.h
+++ b/src/watcher.h
@@ -1,3 +1,11 @@
+/*
+* Copyright (c) 2014,2015 Christian Surlykke, Paulo Lieuthier
+*
+* This file is part of the LXQt project. <http://lxqt.org>
+* It is distributed under the LGPL 2.1 or later license.
+* Please refer to the LICENSE file for a copy of the license.
+*/
+
 #ifndef WATCHER_H
 #define WATCHER_H