diff --git a/bundles/org.openhab.core.karaf/pom.xml b/bundles/org.openhab.core.karaf/pom.xml
index 47ea3bd76..b26dcc6b5 100644
--- a/bundles/org.openhab.core.karaf/pom.xml
+++ b/bundles/org.openhab.core.karaf/pom.xml
@@ -25,17 +25,17 @@
 		<dependency>
 			<groupId>org.apache.karaf.features</groupId>
 			<artifactId>org.apache.karaf.features.core</artifactId>
-			<version>${dep.karaf.version}</version>
+			<version>${karaf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.karaf.shell</groupId>
 			<artifactId>org.apache.karaf.shell.core</artifactId>
-			<version>${dep.karaf.version}</version>
+			<version>${karaf.version}</version>
 		</dependency>		
 		<dependency>
 			<groupId>org.apache.karaf.wrapper</groupId>
 		    <artifactId>org.apache.karaf.wrapper.core</artifactId>
-			<version>${dep.karaf.version}</version>
+			<version>${karaf.version}</version>
 		</dependency>			
 	</dependencies>
 
diff --git a/features/karaf/src/main/feature/feature.xml b/features/karaf/src/main/feature/feature.xml
index 52ee02592..622db0116 100644
--- a/features/karaf/src/main/feature/feature.xml
+++ b/features/karaf/src/main/feature/feature.xml
@@ -9,20 +9,72 @@
     http://www.eclipse.org/legal/epl-v10.html
 
 -->
-<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+
+    <repository>mvn:de.maggu2810.kat.features/apache-commons/${kat.version}/xml/features</repository>
+    <repository>mvn:de.maggu2810.kat.features/gson/${kat.version}/xml/features</repository>
+    <repository>mvn:de.maggu2810.kat.features/jmdns/${kat.version}/xml/features</repository>
+    <repository>mvn:de.maggu2810.kat.features/jupnp/${kat.version}/xml/features</repository>
+    <repository>mvn:de.maggu2810.kat.features/paho/${kat.version}/xml/features</repository>
+    <repository>mvn:de.maggu2810.kat.features/xtext/${kat.version}/xml/features</repository>
+
+    <feature name="shk-jax-rs-min" version="5.3">
+      <feature dependency="true">http</feature>
+      <bundle dependency="true">mvn:com.eclipsesource.jaxrs/jersey-min/2.22.1</bundle>
+      <bundle>mvn:com.eclipsesource.jaxrs/publisher/5.3</bundle>
+    </feature>
+
+    <feature name="shk-jax-rs-provider-gson" version="2.3">
+      <feature dependency="true" version="[5.3,5.4)">shk-jax-rs-min</feature>
+      <feature dependency="true" version="[2.3,2.4)">kat-gson</feature>
+      <bundle>mvn:com.eclipsesource.jaxrs/provider-gson/2.3</bundle>
+    </feature>
+
+    <feature name="shk-jax-rs-provider-swagger" version="1.0.sp1">
+      <feature dependency="true" version="[5.3,5.4)">shk-jax-rs-min</feature>
+      <bundle>mvn:de.maggu2810.thirdparty.modified.com.eclipsesource.jaxrs/swagger-all/1.5.5.sp1</bundle>
+      <bundle>mvn:com.eclipsesource.jaxrs/provider-swagger/1.1</bundle>
+    </feature>
+
+    <feature name="esh-tp-base" description="TargetPlatform Base" version="${project.version}">
+      <feature>eventadmin</feature>
+      <feature>scr</feature>
+      <feature>shk-jax-rs-min</feature>
+      <feature>shk-jax-rs-provider-gson</feature>
+      <feature>shk-jax-rs-provider-swagger</feature>
+      <bundle>mvn:io.swagger/swagger-annotations/1.5.5</bundle>
+    </feature>
+
+    <feature name="esh-tp-commons" version="${project.version}">
+      <feature dependency="true">kat-apache-commons-codec</feature>
+      <feature dependency="true">kat-apache-commons-collections</feature>
+      <feature dependency="true">kat-apache-commons-exec</feature>
+      <feature dependency="true">kat-apache-commons-httpclient</feature>
+      <feature dependency="true">kat-apache-commons-io</feature>
+      <feature dependency="true">kat-apache-commons-lang</feature>
+      <feature dependency="true">kat-apache-commons-net</feature>
+    </feature>
 
     <feature name="esh-tp-jupnp" version="${project.version}">
-      <feature dependency="true">http</feature>
-      <feature>shk-apache-httpclient</feature>
-      <bundle>mvn:org.jupnp/org.jupnp/${jupnp.version}</bundle>
+      <feature version="[2.2.0,3)">kat-jupnp</feature>
       <capability>esh.tp;feature=jupnp</capability>
     </feature>
 
     <feature name="esh-tp-jmdns" version="${project.version}">
-      <bundle>mvn:org.jmdns/jmdns/${jmdns.version}</bundle>
+      <feature version="[3.5.0,4)">kat-jmdns</feature>
       <capability>esh.tp;feature=jmdns</capability>
     </feature>
 
+    <feature name="esh-tp-paho" version="${project.version}">
+      <feature>kat-paho-client-mqttv3</feature>
+      <capability>esh.tp;feature=paho</capability>
+    </feature>
+
+    <feature name="esh-tp-xtext" version="${project.version}">
+      <feature version="[2.9.2,2.9.3)">kat-xtext</feature>
+      <capability>esh.tp;feature=xtext;version=2.9.2</capability>
+    </feature>
+
     <feature name="openhab-runtime-base" description="openHAB Runtime Base" version="${project.version}">
         <feature>esh-base</feature>
         <feature>esh-io-console-karaf</feature>
@@ -38,8 +90,8 @@
         <feature>openhab-runtime-certificate</feature>
         <feature dependency="true">shell</feature>
         <bundle start-level="90">mvn:org.openhab.core/org.openhab.core/${project.version}</bundle>
-        <bundle prerequisite="true">mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${dep.karaf.version}</bundle>
-        <bundle prerequisite="true">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.core/${dep.karaf.version}</bundle>
+        <bundle prerequisite="true">mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${karaf.version}</bundle>
+        <bundle prerequisite="true">mvn:org.apache.karaf.wrapper/org.apache.karaf.wrapper.core/${karaf.version}</bundle>
         <bundle>mvn:org.openhab.core/org.openhab.core.karaf/${project.version}</bundle>
     </feature>
 
diff --git a/features/verify-karaf/pom.xml b/features/verify-karaf/pom.xml
index aa30381ae..7b3d19e82 100644
--- a/features/verify-karaf/pom.xml
+++ b/features/verify-karaf/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>framework</artifactId>
-            <version>${dep.karaf.version}</version>
+            <version>${karaf.version}</version>
             <type>kar</type>
             <scope>provided</scope>
         </dependency>
@@ -30,14 +30,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>de.maggu2810.shk</groupId>
-            <artifactId>shk-feature-base</artifactId>
-            <version>${shk.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>        
         <dependency>
             <groupId>org.openhab.core</groupId>
             <artifactId>openhab-core</artifactId>
@@ -71,10 +63,9 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>mvn:org.apache.karaf.features/framework/${dep.karaf.version}/xml/features</descriptor>
-                                <descriptor>mvn:org.apache.karaf.features/standard/${dep.karaf.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.eclipse.smarthome/karaf/${esh.version}/xml/features</descriptor>
-                                <descriptor>mvn:de.maggu2810.shk/shk-feature-base/${shk.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.openhab.core/openhab-core/${project.version}/xml/features</descriptor>
                             </descriptors>
                             <distribution>org.apache.karaf.features:framework</distribution>
diff --git a/pom.xml b/pom.xml
index 84a538857..65c462f02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,12 +58,8 @@
 
         <ohdr.version>1.0.3</ohdr.version>
         <esh.version>0.8.0-SNAPSHOT</esh.version>
-        <shk.version>1.2</shk.version>
-        <jupnp.version>2.2.0</jupnp.version>
-        <jmdns.version>3.5.0</jmdns.version>
-        <dep.karaf.version>4.0.3</dep.karaf.version>
-        <karaf.maven.plugin.version>4.0.3</karaf.maven.plugin.version>
-        <karaf.features.version>4.0.3</karaf.features.version>
+        <kat.version>1.4.1</kat.version>
+        <karaf.version>4.0.4</karaf.version>
         <maven.compiler.plugin.version>3.3</maven.compiler.plugin.version>
         <build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
         <license.maven.plugin.version>2.10</license.maven.plugin.version>
@@ -93,7 +89,7 @@
                 <plugin>
                     <groupId>org.apache.karaf.tooling</groupId>
                     <artifactId>karaf-maven-plugin</artifactId>
-                    <version>${karaf.maven.plugin.version}</version>
+                    <version>${karaf.version}</version>
                     <extensions>true</extensions>
                 </plugin>
                 <plugin>
@@ -230,10 +226,9 @@
             </snapshots>
         </repository>
 
-        <!-- SHK releases -->
         <repository>
-            <id>shk-bintray</id>
-            <name>Bintray Repository for shk</name>
+            <id>maggu2810-bintray</id>
+            <name>Bintray Repository of maggu2810</name>
             <url>https://dl.bintray.com/maggu2810/maven</url>
             <releases>
                 <enabled>true</enabled>