diff --git a/telldus-gui/TelldusGui/data/telldus/devices.xml b/telldus-gui/TelldusGui/data/telldus/devices.xml
index 9f6b7c39..ba417da0 100644
--- a/telldus-gui/TelldusGui/data/telldus/devices.xml
+++ b/telldus-gui/TelldusGui/data/telldus/devices.xml
@@ -93,6 +93,10 @@
 			<!--<text></text> -->
 			<device model="codeswitch:waveman" protocol="waveman" widget="1" image="waveman_cs" name="Code Switch">Code Switch</device>
 		</vendor>
+		<vendor name="X10 (experimental)" image="x10">
+			<!--<text></text> -->
+			<device model="codeswitch:x10" protocol="x10" widget="1" image="x10" name="Code Switch">Code Switch</device>
+		</vendor>
 	</type>
 	<type name="Projector screens" expanded="true">
 		<vendor name="Roxcore" image="roxcore">
diff --git a/telldus-gui/TelldusGui/data/telldus/resources.qrc b/telldus-gui/TelldusGui/data/telldus/resources.qrc
index ec866d8f..1f8b482a 100644
--- a/telldus-gui/TelldusGui/data/telldus/resources.qrc
+++ b/telldus-gui/TelldusGui/data/telldus/resources.qrc
@@ -16,6 +16,7 @@
         <file>../../images/devices/sartano.png</file>
         <file>../../images/devices/upm_sl.png</file>
         <file>../../images/devices/waveman_cs.png</file>
+        <file>../../images/devices/x10.png</file>
         <file>../../images/devices/zke-2603.png</file>
         <file>../../images/vendors/chacon.png</file>
         <file>../../images/vendors/coco.png</file>
@@ -35,5 +36,6 @@
         <file>../../images/vendors/sartano.png</file>
         <file>../../images/vendors/upm.png</file>
         <file>../../images/vendors/waveman.png</file>
+        <file>../../images/vendors/x10.png</file>
     </qresource>
 </RCC>
diff --git a/telldus-gui/TelldusGui/data/telldus_devices.xml b/telldus-gui/TelldusGui/data/telldus_devices.xml
deleted file mode 100644
index ba417da0..00000000
--- a/telldus-gui/TelldusGui/data/telldus_devices.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf8" ?>
-<devices>
-	<type name="Remote Switches" expanded="true">
-		<!--<text></text> -->
-		<vendor name="Chacon" image="chacon">
-			<!--<text></text>-->
-			<device model="codeswitch:chacon" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
-			<device model="selflearning-switch:chacon" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
-			<device model="selflearning-dimmer:chacon" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
-			<device model="bell:chacon" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
-		</vendor>
-		<vendor name="CoCo Technologies" image="coco">
-			<!--<text>http://www.coco-technology.com/index_EN.htm</text>-->
-			<device model="codeswitch:coco" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
-			<device model="selflearning-switch:coco" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
-			<device model="selflearning-dimmer:coco" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
-			<device model="bell:coco" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
-		</vendor>
-		<vendor name="Conrad" image="conrad">
-			<device model="selflearning:conrad" protocol="risingsun" widget="12" image="conrad-rsl888" name="Self Learning">Self Learning</device>
-		</vendor>
-		<vendor name="Elro" image="elro">
-			<!--<text>http://www.elro-nl.com/elro-en-05/home.htm</text> -->
-			<device model="codeswitch:elro" protocol="sartano" widget="2" image="elro" name="Code Switch">Code Switch</device>
-			<device model="codeswitch:elro-ab600" protocol="arctech" widget="1" image="elro-ab600" name="Code Switch - System AB600">Code Switch - System AB600</device>
-		</vendor>
-		<vendor name="GAO" image="gao">
-			<!--<text>http://www.everflourish.com.cn/</text> -->
-			<device model="codeswitch:gao" protocol="risingsun" widget="10" image="gao_cs" name="Code Switch">Code Switch</device>
-			<device model="selflearning-switch:gao" protocol="everflourish" widget="11" image="gao_sl" name="Self Learning on/off">Self Learning on/off</device>
-		</vendor>
-		<vendor name="HomeEasy" image="homeeasy">
-			<!--<text>http://www.homeeasy.eu/home.php</text>-->
-			<device model="codeswitch:homeeasy" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
-			<device model="selflearning-switch:homeeasy" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
-			<device model="selflearning-dimmer:homeeasy" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
-		</vendor>
-		<vendor name="IKEA" image="ikea">
-			<device model="selflearning:ikea" protocol="ikea" widget="3" image="koppla">Koppla</device>
-		</vendor>
-		<vendor name="Intertechno" image="intertechno">
-			<!--<text>http://www.intertechno.at/</text> -->
-			<device model="codeswitch:homeeasy" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
-			<device model="selflearning-switch:homeeasy" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
-			<device model="selflearning-dimmer:homeeasy" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
-			<device model="bell:homeeasy" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
-		</vendor>
-		<vendor name="Kappa" image="kappa">
-			<!--<text>http://www.kappak.sk</text> -->
-			<device model="codeswitch:kappa" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
-			<device model="selflearning-switch:kappa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
-			<device model="selflearning-dimmer:kappa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
-			<device model="bell:kappa" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
-		</vendor>
-		<vendor name="Kjell o Company" image="kjelloco">
-			<!--<text>http://www.kjell.com/</text> -->
-			<device model="codeswitch:kjelloco" protocol="risingsun" widget="5" image="risingsun_cs" name="Code Switch">Code Switch</device>
-		</vendor>
-		<vendor name="KlikAanKlikUit" image="klikaanklikuit">
-			<!--<text>http://www.klikaanklikuit.nl/producten.asp</text> -->
-			<device model="codeswitch:klikaanklikuit" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
-			<device model="selflearning-switch:klikaanklikuit" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
-			<device model="selflearning-dimmer:klikaanklikuit" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
-			<device model="bell:klikaanklikuit" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
-		</vendor>
-		<vendor name="Nexa" image="nexa">
-			<!--<text>http://www.nexa.se/</text> -->
-			<device model="codeswitch:nexa" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
-			<device model="selflearning-switch:nexa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
-			<device model="selflearning-dimmer:nexa" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
-			<device model="bell:nexa" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
-		</vendor>
-		<vendor name="Proove" image="proove">
-			<!--<text>http://www.proove.se/</text> -->
-			<device model="codeswitch:proove" protocol="arctech" widget="1" image="arctech_cs" name="Code Switch">Code Switch</device>
-			<device model="selflearning-switch:proove" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning on/off">Self Learning on/off</device>
-			<device model="selflearning-dimmer:proove" protocol="arctech" widget="8" image="arctech_sl" name="Self Learning dimmer">Self Learning dimmer</device>
-			<device model="bell:proove" protocol="arctech" widget="4" image="bell" name="Bell">Bell</device>
-		</vendor>
-		<vendor name="Rusta" image="rusta">
-			<!--<text>http://www.rusta.se/</text> -->
-			<device model="codeswitch:rusta" protocol="sartano" widget="2" image="zke-2603" name="Code Switch">Code Switch</device>
-			<device model="selflearning-dimmer:rusta" protocol="arctech" widget="8" image="fr004r" name="Self Learning dimmer">Self Learning dimmer</device>
-		</vendor>
-		<vendor name="Sartano" image="sartano">
-			<!--<text></text> -->
-			<device model="codeswitch:sartano" protocol="sartano" widget="2" image="sartano" name="Code Switch">Code Switch</device>
-		</vendor>
-		<vendor name="UPM" image="upm">
-			<device model="selflearning:upm" protocol="upm" widget="9" image="upm_sl" name="Selflearning">Selflerning</device>
-		</vendor>
-		<vendor name="Waveman" image="waveman">
-			<!--<text></text> -->
-			<device model="codeswitch:waveman" protocol="waveman" widget="1" image="waveman_cs" name="Code Switch">Code Switch</device>
-		</vendor>
-		<vendor name="X10 (experimental)" image="x10">
-			<!--<text></text> -->
-			<device model="codeswitch:x10" protocol="x10" widget="1" image="x10" name="Code Switch">Code Switch</device>
-		</vendor>
-	</type>
-	<type name="Projector screens" expanded="true">
-		<vendor name="Roxcore" image="roxcore">
-			<device model="codeswitch:roxcore" protocol="brateck" widget="6" image="projectorscreen">Projector screen</device>
-		</vendor>
-	</type>
-</devices>
diff --git a/telldus-gui/TelldusGui/data/telldus_resources.qrc b/telldus-gui/TelldusGui/data/telldus_resources.qrc
deleted file mode 100644
index 5aa79f33..00000000
--- a/telldus-gui/TelldusGui/data/telldus_resources.qrc
+++ /dev/null
@@ -1,41 +0,0 @@
-<RCC>
-    <qresource prefix="/" >
-        <file alias="data/devices.xml">telldus_devices.xml</file>
-        <file>../images/devices/arctech_cs.png</file>
-        <file>../images/devices/arctech_sl.png</file>
-        <file>../images/devices/bell.png</file>
-        <file>../images/devices/conrad-rsl888.png</file>
-        <file>../images/devices/elro.png</file>
-        <file>../images/devices/elro-ab600.png</file>
-        <file>../images/devices/fr004r.png</file>
-        <file>../images/devices/gao_cs.png</file>
-        <file>../images/devices/gao_sl.png</file>
-        <file>../images/devices/koppla.png</file>
-        <file>../images/devices/projectorscreen.png</file>
-        <file>../images/devices/risingsun_cs.png</file>
-        <file>../images/devices/sartano.png</file>
-        <file>../images/devices/upm_sl.png</file>
-        <file>../images/devices/waveman_cs.png</file>
-        <file>../images/devices/x10.png</file>
-        <file>../images/devices/zke-2603.png</file>
-        <file>../images/vendors/chacon.png</file>
-        <file>../images/vendors/coco.png</file>
-        <file>../images/vendors/conrad.png</file>
-        <file>../images/vendors/elro.png</file>
-        <file>../images/vendors/gao.png</file>
-        <file>../images/vendors/homeeasy.png</file>
-        <file>../images/vendors/ikea.png</file>
-        <file>../images/vendors/intertechno.png</file>
-        <file>../images/vendors/kappa.png</file>
-        <file>../images/vendors/kjelloco.png</file>
-        <file>../images/vendors/klikaanklikuit.png</file>
-        <file>../images/vendors/nexa.png</file>
-        <file>../images/vendors/proove.png</file>
-        <file>../images/vendors/roxcore.png</file>
-        <file>../images/vendors/rusta.png</file>
-        <file>../images/vendors/sartano.png</file>
-        <file>../images/vendors/upm.png</file>
-        <file>../images/vendors/waveman.png</file>
-        <file>../images/vendors/x10.png</file>
-    </qresource>
-</RCC>