diff --git a/metadata/com.github.grimpy.botifier.txt b/metadata/com.github.grimpy.botifier.txt
index 8c8962ed20..46e24225f3 100644
--- a/metadata/com.github.grimpy.botifier.txt
+++ b/metadata/com.github.grimpy.botifier.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Connectivity
 License:MIT
 Web Site:http://forum.xda-developers.com/showthread.php?t=2421357
 Source Code:https://github.com/grimpy/Botifier
@@ -33,10 +33,7 @@ Build:1.4.1,16
     rm=libs/*
     prebuild=sed -i -e 's/com.android.tools.build:gradle:0.13.0/com.android.tools.build:gradle:0.12.0/g' -e '/fileTree/acompile "com.android.support:support-v4:19.0.+"' build.gradle && \
         rm -fR src/com/github/grimpy/botifier/plugins/liveware/* && \
-        sed -i -e '/import com.github.grimpy.botifier.plugins.liveware/d' \
-            src/com/github/grimpy/botifier/plugins/PluginPreference.java \
-            src/com/github/grimpy/botifier/preference/SettingsFragment.java \
-            src/com/github/grimpy/botifier/receivers/NotificationReceiver.java && \
+        sed -i -e '/import com.github.grimpy.botifier.plugins.liveware/d' src/com/github/grimpy/botifier/plugins/PluginPreference.java src/com/github/grimpy/botifier/preference/SettingsFragment.java src/com/github/grimpy/botifier/receivers/NotificationReceiver.java && \
         sed -i -e '/SW2Preference/,+1d' src/com/github/grimpy/botifier/plugins/PluginPreference.java && \
         sed -i -e '/SWExtensionService.class/,+2d' src/com/github/grimpy/botifier/preference/SettingsFragment.java && \
         sed -i -e '/SWExtensionService.class/,+1d' src/com/github/grimpy/botifier/receivers/NotificationReceiver.java
diff --git a/metadata/com.mohammadag.beamfile.txt b/metadata/com.mohammadag.beamfile.txt
index c307ab5af0..16e3dc3045 100644
--- a/metadata/com.mohammadag.beamfile.txt
+++ b/metadata/com.mohammadag.beamfile.txt
@@ -1,5 +1,5 @@
 AntiFeatures:UpstreamNonFree
-Categories:System
+Categories:Connectivity
 License:GPLv3
 Web Site:http://forum.xda-developers.com/member.php?u=2011359
 Source Code:https://github.com/MohammadAG/android-file-beam
diff --git a/metadata/com.theksmith.android.car_bus_interface.txt b/metadata/com.theksmith.android.car_bus_interface.txt
index 11f9571f3d..ecc0bc60b4 100644
--- a/metadata/com.theksmith.android.car_bus_interface.txt
+++ b/metadata/com.theksmith.android.car_bus_interface.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Connectivity
 License:MIT
 Web Site:https://github.com/theksmith/CarBusInterface/blob/HEAD/README.md
 Source Code:https://github.com/theksmith/CarBusInterface
diff --git a/metadata/com.yubico.yubioath.txt b/metadata/com.yubico.yubioath.txt
index cb6dfc4317..441e23af92 100644
--- a/metadata/com.yubico.yubioath.txt
+++ b/metadata/com.yubico.yubioath.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Connectivity
 License:NewBSD
 Web Site:
 Source Code:https://github.com/Yubico/yubioath-android
diff --git a/metadata/net.kismetwireless.android.smarterwifimanager.txt b/metadata/net.kismetwireless.android.smarterwifimanager.txt
index b1e760e7d1..15b91423e6 100644
--- a/metadata/net.kismetwireless.android.smarterwifimanager.txt
+++ b/metadata/net.kismetwireless.android.smarterwifimanager.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Connectivity
 License:GPLv2
 Web Site:http://kismetwireless.net/android-swm
 Source Code:http://kismetwireless.net/gitweb/?p=android-smarterwifi.git;a=summary
diff --git a/metadata/pl.net.szafraniec.NFCTagmaker.txt b/metadata/pl.net.szafraniec.NFCTagmaker.txt
index af63ccf88c..bca14a8d68 100644
--- a/metadata/pl.net.szafraniec.NFCTagmaker.txt
+++ b/metadata/pl.net.szafraniec.NFCTagmaker.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Connectivity
 License:GPLv3+
 Web Site:https://github.com/mateusz-szafraniec/NFCTagmaker/blob/HEAD/README.md
 Source Code:https://github.com/mateusz-szafraniec/NFCTagmaker
diff --git a/metadata/ru.sash0k.bluetooth_terminal.txt b/metadata/ru.sash0k.bluetooth_terminal.txt
index 2834d381c7..393c9de5cb 100644
--- a/metadata/ru.sash0k.bluetooth_terminal.txt
+++ b/metadata/ru.sash0k.bluetooth_terminal.txt
@@ -1,4 +1,4 @@
-Categories:Development,System
+Categories:Development,Connectivity
 License:Apache2
 Web Site:
 Source Code:https://github.com/Sash0k/bluetooth-spp-terminal
diff --git a/metadata/tum.betriebsysteme.kostadinov.txt b/metadata/tum.betriebsysteme.kostadinov.txt
index b9cc197a97..23612a2032 100644
--- a/metadata/tum.betriebsysteme.kostadinov.txt
+++ b/metadata/tum.betriebsysteme.kostadinov.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Connectivity
 License:GPLv3
 Web Site:https://code.google.com/p/android-bluetooth-touchpad
 Source Code:https://code.google.com/p/android-bluetooth-touchpad/source