diff --git a/devicedb-lib/devicedb-lib.pro b/devicedb-lib/devicedb-lib.pro
index 2621618..bd096a7 100644
--- a/devicedb-lib/devicedb-lib.pro
+++ b/devicedb-lib/devicedb-lib.pro
@@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = devicedb-lib
 TEMPLATE = lib
-CONFIG += staticlib
+CONFIG += staticlib silent
 
 
 
diff --git a/osxmakebundle.sh b/osxmakebundle.sh
index 0b2ccf8..e52fea9 100755
--- a/osxmakebundle.sh
+++ b/osxmakebundle.sh
@@ -3,8 +3,8 @@ if [ $# -lt 3 ]; then
 	echo "Please Provide the path to the App Bundle and OZW Config Directory and QT Directories"
 	exit 1
 fi
-if [ ! -f $1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave ]; then
-	echo "$1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave doens't exist"
+if [ ! -f $1/Contents/Frameworks/libqt-openzwave.1.dylib ]; then
+	echo "$1/Contents/Frameworks/libqt-openzwave.1.dylib doens't exist"
 	exit 1
 fi
 if [ ! -f $2/manufacturer_specific.xml ]; then
@@ -15,7 +15,7 @@ if [ ! -f $3/bin/macdeployqt ]; then
 	echo "$3/bin/macdeployqt  does't exist"
 	exit 1
 fi
-PATH=`otool -L $1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave  | grep libopenzwave | awk '{print $1}'`
-/usr/bin/install_name_tool -change $PATH "@rpath/${PATH##*/}" $1/Contents/Frameworks/qt-openzwave.framework/qt-openzwave 
+PATH=`otool -L $1/Contents/Frameworks/libqt-openzwave.1.dylib  | grep libopenzwave | awk '{print $1}'`
+/usr/bin/install_name_tool -change $PATH "@rpath/${PATH##*/}" $1/Contents/Frameworks/libqt-openzwave.1.dylib
 /bin/cp -r $2 $1/Contents/Resources/config/
 echo "To Finish Please Run '$3/bin/macdeployqt $1 -verbose=2 -always-overwrite'"
diff --git a/ozwadmin-main/configuration.cpp b/ozwadmin-main/configuration.cpp
index 7b375d3..861c8a3 100644
--- a/ozwadmin-main/configuration.cpp
+++ b/ozwadmin-main/configuration.cpp
@@ -5,7 +5,7 @@
 #include "ui_configuration.h"
 
 #include "propertybrowser/qtvariantproperty.h"
-#include "propertybrowser/QtTreePropertyBrowser"
+#include "propertybrowser/qttreepropertybrowser.h"
 
 
 Configuration::Configuration(QTOZWOptions *options, QWidget *parent) :
diff --git a/ozwadmin-main/ozwadmin-main.pro b/ozwadmin-main/ozwadmin-main.pro
index 7d25295..95a5119 100644
--- a/ozwadmin-main/ozwadmin-main.pro
+++ b/ozwadmin-main/ozwadmin-main.pro
@@ -4,16 +4,15 @@
 #
 #-------------------------------------------------
 
-QT       += core gui xml remoteobjects websockets svg
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets xml remoteobjects websockets svg
+CONFIG  += silent
 
 TARGET = ../ozwadmin
 TEMPLATE = app
 
 SOURCES += main.cpp\
     configuration.cpp \
-        mainwindow.cpp \
+    mainwindow.cpp \
     metadatawindow.cpp \
     util.cpp \
     logwindow.cpp
@@ -28,6 +27,11 @@ FORMS    += mainwindow.ui \
     configuration.ui \
     metadatawindow.ui
 
+RESOURCES += \
+    ozwadmin-main.qrc \
+
+
+
 LIBS += ../devicedb-lib/libdevicedb-lib.a ../ozwadmin-widgets/libozwadmin-widgets.a
 INCLUDEPATH += ../devicedb-lib ../ozwadmin-widgets
 
@@ -38,20 +42,14 @@ QMAKE_EXTRA_TARGETS += ozwconfig
 PRE_TARGETDEPS += config/qrc_ozwconfig.cpp
 SOURCES += config/qrc_ozwconfig.cpp
 
+INCLUDEPATH += ../../qt-openzwave/qt-openzwave/include/
+LIBS += -L../../qt-openzwave/qt-openzwave/ -lqt-openzwave
+
 macx: {
-    QMAKE_CXXFLAGS += -F../../qt-openzwave/qt-openzwave/
     LIBS += -framework IOKit -framework CoreFoundation
-    LIBS += -F../../qt-openzwave/qt-openzwave/ -framework qt-openzwave
-    BUNDLE.files = ../../qt-openzwave/qt-openzwave/qt-openzwave.framework/
-    BUNDLE.path = Contents/Frameworks/qt-openzwave.framework/
-    LIBOZW.files = ../../open-zwave/libopenzwave-1.6.dylib
-    LIBOZW.path = Contents/Frameworks/
-    QMAKE_BUNDLE_DATA += BUNDLE LIBOZW
+    BUNDLE.files = ../../qt-openzwave/qt-openzwave/libqt-openzwave.1.dylib ../../open-zwave/libopenzwave-1.6.dylib
+    BUNDLE.path = Contents/Frameworks/
+    QMAKE_BUNDLE_DATA += BUNDLE
     ICON = res/ozw_logo.icns
-} else {
-    LIBS += -L../../qt-openzwave/qt-openzwave/ -lqt-openzwave -L../../open-zwave/ -lopenzwave -lresolv
-    INCLUDEPATH += ../../qt-openzwave/qt-openzwave/include/
 }
 
-RESOURCES += \
-    ozwadmin-main.qrc \
diff --git a/ozwadmin-widgets/ozwadmin-widgets.pro b/ozwadmin-widgets/ozwadmin-widgets.pro
index 63d2e82..a18a8cc 100644
--- a/ozwadmin-widgets/ozwadmin-widgets.pro
+++ b/ozwadmin-widgets/ozwadmin-widgets.pro
@@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = ozwadmin-widgets
 TEMPLATE = lib
-CONFIG += staticlib
+CONFIG += staticlib silent
 
 
 SOURCES += widgets.cpp \
@@ -31,55 +31,6 @@ HEADERS  += widgets.h \
     bitsetwidget.h \
     node_delegate.h \
     nodeflagswidget.h \
-    propertybrowser/QtAbstractEditorFactoryBase \
-    propertybrowser/QtAbstractPropertyBrowser \
-    propertybrowser/QtAbstractPropertyManager \
-    propertybrowser/QtBoolPropertyManager \
-    propertybrowser/QtBrowserItem \
-    propertybrowser/QtButtonPropertyBrowser \
-    propertybrowser/QtCharEditorFactory \
-    propertybrowser/QtCharPropertyManager \
-    propertybrowser/QtCheckBoxFactory \
-    propertybrowser/QtColorEditorFactory \
-    propertybrowser/QtColorPropertyManager \
-    propertybrowser/QtCursorEditorFactory \
-    propertybrowser/QtCursorPropertyManager \
-    propertybrowser/QtDateEditFactory \
-    propertybrowser/QtDatePropertyManager \
-    propertybrowser/QtDateTimeEditFactory \
-    propertybrowser/QtDateTimePropertyManager \
-    propertybrowser/QtDoublePropertyManager \
-    propertybrowser/QtDoubleSpinBoxFactory \
-    propertybrowser/QtEnumEditorFactory \
-    propertybrowser/QtEnumPropertyManager \
-    propertybrowser/QtFlagPropertyManager \
-    propertybrowser/QtFontEditorFactory \
-    propertybrowser/QtFontPropertyManager \
-    propertybrowser/QtGroupBoxPropertyBrowser \
-    propertybrowser/QtGroupPropertyManager \
-    propertybrowser/QtIntPropertyManager \
-    propertybrowser/QtKeySequenceEditorFactory \
-    propertybrowser/QtKeySequencePropertyManager \
-    propertybrowser/QtLineEditFactory \
-    propertybrowser/QtLocalePropertyManager \
-    propertybrowser/QtPointFPropertyManager \
-    propertybrowser/QtPointPropertyManager \
-    propertybrowser/QtProperty \
-    propertybrowser/QtRectFPropertyManager \
-    propertybrowser/QtRectPropertyManager \
-    propertybrowser/QtScrollBarFactory \
-    propertybrowser/QtSizeFPropertyManager \
-    propertybrowser/QtSizePolicyPropertyManager \
-    propertybrowser/QtSizePropertyManager \
-    propertybrowser/QtSliderFactory \
-    propertybrowser/QtSpinBoxFactory \
-    propertybrowser/QtStringPropertyManager \
-    propertybrowser/QtTimeEditFactory \
-    propertybrowser/QtTimePropertyManager \
-    propertybrowser/QtTreePropertyBrowser \
-    propertybrowser/QtVariantEditorFactory \
-    propertybrowser/QtVariantProperty \
-    propertybrowser/QtVariantPropertyManager \
     propertybrowser/qtbuttonpropertybrowser.h \
     propertybrowser/qteditorfactory.h \
     propertybrowser/qtgroupboxpropertybrowser.h \
diff --git a/ozwadmin-widgets/propertybrowser/QtAbstractEditorFactoryBase b/ozwadmin-widgets/propertybrowser/QtAbstractEditorFactoryBase
deleted file mode 100644
index ab4e710..0000000
--- a/ozwadmin-widgets/propertybrowser/QtAbstractEditorFactoryBase
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertybrowser.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtAbstractPropertyBrowser b/ozwadmin-widgets/propertybrowser/QtAbstractPropertyBrowser
deleted file mode 100644
index ab4e710..0000000
--- a/ozwadmin-widgets/propertybrowser/QtAbstractPropertyBrowser
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertybrowser.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtAbstractPropertyManager b/ozwadmin-widgets/propertybrowser/QtAbstractPropertyManager
deleted file mode 100644
index ab4e710..0000000
--- a/ozwadmin-widgets/propertybrowser/QtAbstractPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertybrowser.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtBoolPropertyManager b/ozwadmin-widgets/propertybrowser/QtBoolPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtBoolPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtBrowserItem b/ozwadmin-widgets/propertybrowser/QtBrowserItem
deleted file mode 100644
index ab4e710..0000000
--- a/ozwadmin-widgets/propertybrowser/QtBrowserItem
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertybrowser.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtButtonPropertyBrowser b/ozwadmin-widgets/propertybrowser/QtButtonPropertyBrowser
deleted file mode 100644
index 56e0897..0000000
--- a/ozwadmin-widgets/propertybrowser/QtButtonPropertyBrowser
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtbuttonpropertybrowser.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtCharEditorFactory b/ozwadmin-widgets/propertybrowser/QtCharEditorFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtCharEditorFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtCharPropertyManager b/ozwadmin-widgets/propertybrowser/QtCharPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtCharPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtCheckBoxFactory b/ozwadmin-widgets/propertybrowser/QtCheckBoxFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtCheckBoxFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtColorEditorFactory b/ozwadmin-widgets/propertybrowser/QtColorEditorFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtColorEditorFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtColorPropertyManager b/ozwadmin-widgets/propertybrowser/QtColorPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtColorPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtCursorEditorFactory b/ozwadmin-widgets/propertybrowser/QtCursorEditorFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtCursorEditorFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtCursorPropertyManager b/ozwadmin-widgets/propertybrowser/QtCursorPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtCursorPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtDateEditFactory b/ozwadmin-widgets/propertybrowser/QtDateEditFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtDateEditFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtDatePropertyManager b/ozwadmin-widgets/propertybrowser/QtDatePropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtDatePropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtDateTimeEditFactory b/ozwadmin-widgets/propertybrowser/QtDateTimeEditFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtDateTimeEditFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtDateTimePropertyManager b/ozwadmin-widgets/propertybrowser/QtDateTimePropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtDateTimePropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtDoublePropertyManager b/ozwadmin-widgets/propertybrowser/QtDoublePropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtDoublePropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtDoubleSpinBoxFactory b/ozwadmin-widgets/propertybrowser/QtDoubleSpinBoxFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtDoubleSpinBoxFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtEnumEditorFactory b/ozwadmin-widgets/propertybrowser/QtEnumEditorFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtEnumEditorFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtEnumPropertyManager b/ozwadmin-widgets/propertybrowser/QtEnumPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtEnumPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtFlagPropertyManager b/ozwadmin-widgets/propertybrowser/QtFlagPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtFlagPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtFontEditorFactory b/ozwadmin-widgets/propertybrowser/QtFontEditorFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtFontEditorFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtFontPropertyManager b/ozwadmin-widgets/propertybrowser/QtFontPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtFontPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtGroupBoxPropertyBrowser b/ozwadmin-widgets/propertybrowser/QtGroupBoxPropertyBrowser
deleted file mode 100644
index 27964c0..0000000
--- a/ozwadmin-widgets/propertybrowser/QtGroupBoxPropertyBrowser
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtgroupboxpropertybrowser.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtGroupPropertyManager b/ozwadmin-widgets/propertybrowser/QtGroupPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtGroupPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtIntPropertyManager b/ozwadmin-widgets/propertybrowser/QtIntPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtIntPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtKeySequenceEditorFactory b/ozwadmin-widgets/propertybrowser/QtKeySequenceEditorFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtKeySequenceEditorFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtKeySequencePropertyManager b/ozwadmin-widgets/propertybrowser/QtKeySequencePropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtKeySequencePropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtLineEditFactory b/ozwadmin-widgets/propertybrowser/QtLineEditFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtLineEditFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtLocalePropertyManager b/ozwadmin-widgets/propertybrowser/QtLocalePropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtLocalePropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtPointFPropertyManager b/ozwadmin-widgets/propertybrowser/QtPointFPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtPointFPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtPointPropertyManager b/ozwadmin-widgets/propertybrowser/QtPointPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtPointPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtProperty b/ozwadmin-widgets/propertybrowser/QtProperty
deleted file mode 100644
index ab4e710..0000000
--- a/ozwadmin-widgets/propertybrowser/QtProperty
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertybrowser.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtRectFPropertyManager b/ozwadmin-widgets/propertybrowser/QtRectFPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtRectFPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtRectPropertyManager b/ozwadmin-widgets/propertybrowser/QtRectPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtRectPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtScrollBarFactory b/ozwadmin-widgets/propertybrowser/QtScrollBarFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtScrollBarFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtSizeFPropertyManager b/ozwadmin-widgets/propertybrowser/QtSizeFPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtSizeFPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtSizePolicyPropertyManager b/ozwadmin-widgets/propertybrowser/QtSizePolicyPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtSizePolicyPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtSizePropertyManager b/ozwadmin-widgets/propertybrowser/QtSizePropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtSizePropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtSliderFactory b/ozwadmin-widgets/propertybrowser/QtSliderFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtSliderFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtSpinBoxFactory b/ozwadmin-widgets/propertybrowser/QtSpinBoxFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtSpinBoxFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtStringPropertyManager b/ozwadmin-widgets/propertybrowser/QtStringPropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtStringPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtTimeEditFactory b/ozwadmin-widgets/propertybrowser/QtTimeEditFactory
deleted file mode 100644
index 75f35ad..0000000
--- a/ozwadmin-widgets/propertybrowser/QtTimeEditFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qteditorfactory.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtTimePropertyManager b/ozwadmin-widgets/propertybrowser/QtTimePropertyManager
deleted file mode 100644
index 1842e43..0000000
--- a/ozwadmin-widgets/propertybrowser/QtTimePropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtpropertymanager.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtTreePropertyBrowser b/ozwadmin-widgets/propertybrowser/QtTreePropertyBrowser
deleted file mode 100644
index aab106c..0000000
--- a/ozwadmin-widgets/propertybrowser/QtTreePropertyBrowser
+++ /dev/null
@@ -1 +0,0 @@
-#include "qttreepropertybrowser.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtVariantEditorFactory b/ozwadmin-widgets/propertybrowser/QtVariantEditorFactory
deleted file mode 100644
index 8118190..0000000
--- a/ozwadmin-widgets/propertybrowser/QtVariantEditorFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtvariantproperty.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtVariantProperty b/ozwadmin-widgets/propertybrowser/QtVariantProperty
deleted file mode 100644
index 8118190..0000000
--- a/ozwadmin-widgets/propertybrowser/QtVariantProperty
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtvariantproperty.h"
diff --git a/ozwadmin-widgets/propertybrowser/QtVariantPropertyManager b/ozwadmin-widgets/propertybrowser/QtVariantPropertyManager
deleted file mode 100644
index 8118190..0000000
--- a/ozwadmin-widgets/propertybrowser/QtVariantPropertyManager
+++ /dev/null
@@ -1 +0,0 @@
-#include "qtvariantproperty.h"
diff --git a/ozwadmin-widgets/propertybrowser/qtpropertymanager.cpp b/ozwadmin-widgets/propertybrowser/qtpropertymanager.cpp
index 6c30358..c82f80a 100644
--- a/ozwadmin-widgets/propertybrowser/qtpropertymanager.cpp
+++ b/ozwadmin-widgets/propertybrowser/qtpropertymanager.cpp
@@ -1543,7 +1543,7 @@ void QtStringPropertyManager::setReadOnly(QtProperty *property, bool readOnly)
     it.value() = data;
 
     emit propertyChanged(property);
-    emit readOnlyChanged(property, data.echoMode);
+    emit readOnlyChanged(property, data.readOnly);
 }
 
 /*!