diff --git a/.gitignore b/.gitignore
index 2f7896d1d1365eafb0da03d9fe456fac81408487..0bdd78e13a3bfad1f3fb6355d6fa6810b2b91c42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 target/
+*.iml
\ No newline at end of file
diff --git a/build.properties b/build.properties
deleted file mode 100644
index f16d47d849dfc8040bebb0230739207d8a2a6faa..0000000000000000000000000000000000000000
--- a/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source..=src/main/java/
-output..=target/classes
-bin.includes=META-INF/,\
-             .,\
-             OSGI-INF/,\
-             ESH-INF/
diff --git a/pom.xml b/pom.xml
index ec585dbee7171a48aee31939a88a3ebbcc5b1993..09f0ed2b73b84ff7f6486f091e9bcb792f4e4dae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.mqtt</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.openhab.addons.bundles</groupId>
     <artifactId>org.openhab.addons.reactor.bundles</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.binding.openlicht</artifactId>
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index e086eca1f76e6aa5926f59ef2e82d82e44b952fd..a0089008a70bec73bdfbe29f5d6d44fcd4fad6ff 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-	Copyright (c) 2010-2020 Contributors to the openHAB project
-
-	See the NOTICE file(s) distributed with this work for additional
-	information.
-
-	This program and the accompanying materials are made available under the
-	terms of the Eclipse Public License 2.0 which is available at
-	http://www.eclipse.org/legal/epl-2.0
-
-	SPDX-License-Identifier: EPL-2.0
-
--->
 <features name="org.openhab.binding.openlicht-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
 	<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
 
diff --git a/src/main/history/dependencies.xml b/src/main/history/dependencies.xml
index 2a648aa1fad5b88d5df1d2155d3e14ffb91b7f8d..87aff69813de3cb447e7593a96402e649ec6c5d9 100644
--- a/src/main/history/dependencies.xml
+++ b/src/main/history/dependencies.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="org.openhab.binding.openlicht-3.0.0-SNAPSHOT">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="org.openhab.binding.openlicht-3.1.0-SNAPSHOT">
     <feature version="0.0.0">
         <feature>openhab-runtime-base</feature>
         <feature>wrap</feature>
-        <bundle>mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/3.0.0-SNAPSHOT</bundle>
-        <bundle>mvn:org.openhab.addons.bundles/org.openhab.binding.openlicht/3.0.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/3.1.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.openhab.addons.bundles/org.openhab.binding.openlicht/3.1.0-SNAPSHOT</bundle>
         <bundle>wrap:mvn:org.lastnpe.eea/eea-all/2.2.1</bundle>
     </feature>
 </features>
diff --git a/src/main/resources/OH-INF/thing/thing-types.xml b/src/main/resources/OH-INF/thing/thing-types.xml
index b7dbb83eb61399c1cb8814f45adf1f9c6122b045..33bb3fe2f28a86e9a2aaeb51fc4e69a2bae5aaab 100644
--- a/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/src/main/resources/OH-INF/thing/thing-types.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <thing:thing-descriptions bindingId="openlicht"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
-	xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
 
 	<!-- Eraser Thing Type -->
 	<thing-type id="eraser">