diff --git a/debian/control b/debian/control
index 44cbcf7..ce2499f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Standards-Version: 3.9.3
 
 Package: guh-plugin-avahimonitor
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Description: guh.io plugin for avahimonitor
@@ -191,13 +192,6 @@ Depends: ${shlibs:Depends},
 Description: guh.io plugin for senic
   guh.io plugin for senic
 
-Package: guh-plugin-tune
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-Description: guh.io plugin for tune
-  guh.io plugin for tune
-
 Package: guh-plugin-udpcommander
 Architecture: any
 Depends: ${shlibs:Depends},
diff --git a/debian/guh-plugin-eq-3.install.in b/debian/guh-plugin-eq-3.install.in
index b03a4bc..ad0c40e 100644
--- a/debian/guh-plugin-eq-3.install.in
+++ b/debian/guh-plugin-eq-3.install.in
@@ -1 +1 @@
-usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_deviceplugineq-3.so
\ No newline at end of file
+usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_deviceplugineq3.so
diff --git a/debian/guh-plugin-tune.install.in b/debian/guh-plugin-tune.install.in
deleted file mode 100644
index 2fdef7d..0000000
--- a/debian/guh-plugin-tune.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_deviceplugintune.so
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 2d33f6a..3d16dae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,14 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+PREPROCESS_FILES := $(wildcard debian/*.in)
+
+$(PREPROCESS_FILES:.in=): %: %.in
+	sed 's,/@DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH:%=/%),g' $< > $@
+
 %:
 	dh $@
+
+override_dh_install: $(PREPROCESS_FILES:.in=)
+	dh_install --fail-missing
diff --git a/genericelements/translations/de_DE.ts b/genericelements/translations/de_DE.ts
index da2672c..b1ad8bb 100644
--- a/genericelements/translations/de_DE.ts
+++ b/genericelements/translations/de_DE.ts
@@ -4,85 +4,85 @@
 <context>
     <name>GenericElements</name>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="39"/>
+        <location filename="../plugininfo.h" line="39"/>
         <source>Generic Elements</source>
         <extracomment>The name of the plugin Generic Elements (6e22161e-39b7-4416-8623-39e730721efb)</extracomment>
         <translation>Generische Elemente</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="42"/>
+        <location filename="../plugininfo.h" line="42"/>
         <source>guh</source>
         <extracomment>The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6)</extracomment>
         <translation>guh</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="45"/>
+        <location filename="../plugininfo.h" line="45"/>
         <source>Toggle Button</source>
         <extracomment>The name of the DeviceClass (c0f511f9-70f5-499b-bd70-2c0e9ddd68c4)</extracomment>
         <translation>Toggle Taster</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="48"/>
+        <location filename="../plugininfo.h" line="48"/>
         <source>state changed</source>
         <extracomment>The name of the autocreated EventType (b5e90567-54aa-49bd-a78a-3c19fb38aaf5)</extracomment>
         <translation>Status geändert</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="51"/>
+        <location filename="../plugininfo.h" line="51"/>
         <source>state</source>
         <extracomment>The name of the ParamType of StateType (b5e90567-54aa-49bd-a78a-3c19fb38aaf5) of DeviceClass Toggle Button</extracomment>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="54"/>
+        <location filename="../plugininfo.h" line="54"/>
         <source>Set state</source>
         <extracomment>The name of the autocreated ActionType (b5e90567-54aa-49bd-a78a-3c19fb38aaf5)</extracomment>
         <translation>Setze Status</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="57"/>
+        <location filename="../plugininfo.h" line="57"/>
         <source>Button</source>
         <extracomment>The name of the DeviceClass (820b2f2d-0d92-48c8-8fd4-f94ce8fc4103)</extracomment>
         <translation>Taster</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="60"/>
+        <location filename="../plugininfo.h" line="60"/>
         <source>press</source>
         <extracomment>The name of the ActionType 01f38af1-b2ab-4ec3-844e-ef52f0f229a9 of deviceClass Button</extracomment>
         <translation>Drücken</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="63"/>
+        <location filename="../plugininfo.h" line="63"/>
         <source>button pressed</source>
         <extracomment>The name of the EventType effdbc2d-e467-4b0b-80a9-9dda251bfa5c of deviceClass Button</extracomment>
         <translation>Taster gedrückt</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="66"/>
+        <location filename="../plugininfo.h" line="66"/>
         <source>ON/OFF Button</source>
         <extracomment>The name of the DeviceClass (430d188c-476d-4825-a9bd-86dfa3094b56)</extracomment>
         <translation>An/Aus Taster</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="69"/>
+        <location filename="../plugininfo.h" line="69"/>
         <source>press ON</source>
         <extracomment>The name of the ActionType 892596d2-0863-4807-97da-469b9f7003f2 of deviceClass ON/OFF Button</extracomment>
         <translation>Drücke AN</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="72"/>
+        <location filename="../plugininfo.h" line="72"/>
         <source>press OFF</source>
         <extracomment>The name of the ActionType a8d64050-0b58-4ccf-b052-77ce2b7368ad of deviceClass ON/OFF Button</extracomment>
         <translation>Drücke AUS</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="75"/>
+        <location filename="../plugininfo.h" line="75"/>
         <source>ON pressed</source>
         <extracomment>The name of the EventType 4eeba6a2-e4c7-4a2e-8360-2797d98114e6 of deviceClass ON/OFF Button</extracomment>
         <translation>An gedrückt</translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="78"/>
+        <location filename="../plugininfo.h" line="78"/>
         <source>OFF pressed</source>
         <extracomment>The name of the EventType b636c5f3-2eb0-4682-96d4-88a4aa9d2c12 of deviceClass ON/OFF Button</extracomment>
         <translation>Aus gedrückt</translation>
diff --git a/genericelements/translations/en_US.ts b/genericelements/translations/en_US.ts
index 0a8c935..4ab17e3 100644
--- a/genericelements/translations/en_US.ts
+++ b/genericelements/translations/en_US.ts
@@ -4,85 +4,85 @@
 <context>
     <name>GenericElements</name>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="39"/>
+        <location filename="../plugininfo.h" line="39"/>
         <source>Generic Elements</source>
         <extracomment>The name of the plugin Generic Elements (6e22161e-39b7-4416-8623-39e730721efb)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="42"/>
+        <location filename="../plugininfo.h" line="42"/>
         <source>guh</source>
         <extracomment>The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="45"/>
+        <location filename="../plugininfo.h" line="45"/>
         <source>Toggle Button</source>
         <extracomment>The name of the DeviceClass (c0f511f9-70f5-499b-bd70-2c0e9ddd68c4)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="48"/>
+        <location filename="../plugininfo.h" line="48"/>
         <source>state changed</source>
         <extracomment>The name of the autocreated EventType (b5e90567-54aa-49bd-a78a-3c19fb38aaf5)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="51"/>
+        <location filename="../plugininfo.h" line="51"/>
         <source>state</source>
         <extracomment>The name of the ParamType of StateType (b5e90567-54aa-49bd-a78a-3c19fb38aaf5) of DeviceClass Toggle Button</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="54"/>
+        <location filename="../plugininfo.h" line="54"/>
         <source>Set state</source>
         <extracomment>The name of the autocreated ActionType (b5e90567-54aa-49bd-a78a-3c19fb38aaf5)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="57"/>
+        <location filename="../plugininfo.h" line="57"/>
         <source>Button</source>
         <extracomment>The name of the DeviceClass (820b2f2d-0d92-48c8-8fd4-f94ce8fc4103)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="60"/>
+        <location filename="../plugininfo.h" line="60"/>
         <source>press</source>
         <extracomment>The name of the ActionType 01f38af1-b2ab-4ec3-844e-ef52f0f229a9 of deviceClass Button</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="63"/>
+        <location filename="../plugininfo.h" line="63"/>
         <source>button pressed</source>
         <extracomment>The name of the EventType effdbc2d-e467-4b0b-80a9-9dda251bfa5c of deviceClass Button</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="66"/>
+        <location filename="../plugininfo.h" line="66"/>
         <source>ON/OFF Button</source>
         <extracomment>The name of the DeviceClass (430d188c-476d-4825-a9bd-86dfa3094b56)</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="69"/>
+        <location filename="../plugininfo.h" line="69"/>
         <source>press ON</source>
         <extracomment>The name of the ActionType 892596d2-0863-4807-97da-469b9f7003f2 of deviceClass ON/OFF Button</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="72"/>
+        <location filename="../plugininfo.h" line="72"/>
         <source>press OFF</source>
         <extracomment>The name of the ActionType a8d64050-0b58-4ccf-b052-77ce2b7368ad of deviceClass ON/OFF Button</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="75"/>
+        <location filename="../plugininfo.h" line="75"/>
         <source>ON pressed</source>
         <extracomment>The name of the EventType 4eeba6a2-e4c7-4a2e-8360-2797d98114e6 of deviceClass ON/OFF Button</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../build-guh-plugins-5_8_desktop-Debug/genericelements/plugininfo.h" line="78"/>
+        <location filename="../plugininfo.h" line="78"/>
         <source>OFF pressed</source>
         <extracomment>The name of the EventType b636c5f3-2eb0-4682-96d4-88a4aa9d2c12 of deviceClass ON/OFF Button</extracomment>
         <translation type="unfinished"></translation>