diff --git a/.gitmodules b/.gitmodules
index 767be4a..2c0521c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,60 +1,80 @@
 [submodule "AdobeICCProfiles"]
 	path = AdobeICCProfiles
 	url = ../../pool/AdobeICCProfiles.git
+	branch = leap-16.0-nonfree
 [submodule "Reaction"]
 	path = Reaction
 	url = ../../pool/Reaction.git
+	branch = leap-16.0-nonfree
 [submodule "Reaction-data"]
 	path = Reaction-data
 	url = ../../pool/Reaction-data.git
+	branch = leap-16.0-nonfree
 [submodule "bladeRF-fpga-firmware"]
 	path = bladeRF-fpga-firmware
 	url = ../../pool/bladeRF-fpga-firmware.git
+	branch = leap-16.0-nonfree
 [submodule "bladeRF-fx3-firmware"]
 	path = bladeRF-fx3-firmware
 	url = ../../pool/bladeRF-fx3-firmware.git
+	branch = leap-16.0-nonfree
 [submodule "bpg-fonts"]
 	path = bpg-fonts
 	url = ../../pool/bpg-fonts.git
+	branch = leap-16.0-nonfree
 [submodule "discord"]
 	path = discord
 	url = ../../pool/discord.git
+	branch = leap-16.0-nonfree
 [submodule "iozone"]
 	path = iozone
 	url = ../../pool/iozone.git
+	branch = leap-16.0-nonfree
 [submodule "ivtv-firmware"]
 	path = ivtv-firmware
 	url = ../../pool/ivtv-firmware.git
+	branch = leap-16.0-nonfree
 [submodule "john-wordlists"]
 	path = john-wordlists
 	url = ../../pool/john-wordlists.git
+	branch = leap-16.0-nonfree
 [submodule "netperf"]
 	path = netperf
 	url = ../../pool/netperf.git
+	branch = leap-16.0-nonfree
 [submodule "nmap"]
 	path = nmap
 	url = ../../pool/nmap.git
+	branch = leap-16.0-nonfree
 [submodule "opera"]
 	path = opera
 	url = ../../pool/opera.git
+	branch = leap-16.0-nonfree
 [submodule "patterns-non_oss"]
 	path = patterns-non_oss
 	url = ../../pool/patterns-non_oss.git
+	branch = leap-16.0-nonfree
 [submodule "perlref"]
 	path = perlref
 	url = ../../pool/perlref.git
+	branch = leap-16.0-nonfree
 [submodule "steamcmd"]
 	path = steamcmd
 	url = ../../pool/steamcmd.git
+	branch = leap-16.0-nonfree
 [submodule "stream"]
 	path = stream
 	url = ../../pool/stream.git
+	branch = leap-16.0-nonfree
 [submodule "unrar"]
 	path = unrar
 	url = ../../pool/unrar.git
+	branch = leap-16.0-nonfree
 [submodule "wine-mono"]
 	path = wine-mono
 	url = ../../pool/wine-mono.git
+	branch = leap-16.0-nonfree
 [submodule "xv"]
 	path = xv
 	url = ../../pool/xv.git
+	branch = leap-16.0-nonfree
diff --git a/_config b/_config
index 4547525..228e2fb 100644
--- a/_config
+++ b/_config
@@ -1,7 +1,9 @@
-%if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:Rebuild"
+Release: <CI_CNT>.<B_CNT> spec:lp160.<CI_CNT>.<B_CNT>
+
+%if "%_project" == "openSUSE:Leap:16.0:NonFree"
 Macros:
 %vendor openSUSE
-%distribution openSUSE Tumbleweed
-%packager http://bugs.opensuse.org
+%distribution openSUSE Leap 16.0
+%packager https://bugs.opensuse.org
 :Macros
-%endif
\ No newline at end of file
+%endif
diff --git a/_maintainership.json b/_maintainership.json
index 14c828c..d8fc850 100644
--- a/_maintainership.json
+++ b/_maintainership.json
@@ -1,7 +1,5 @@
 {
     "": ["lkocman-factory","maxlin_factory"],
-    "000release-packages": [],
-    "7kaa-music": [],
     "AdobeICCProfiles": [],
     "Reaction": [],
     "Reaction-data": [],
@@ -9,20 +7,15 @@
     "bladeRF-fpga-firmware": [],
     "bladeRF-fx3-firmware": [],
     "bpg-fonts": [],
-    "devilutionx": [],
     "discord": [],
     "iozone": [],
     "ivtv-firmware": [],
     "john-wordlists": [],
-    "mikachan-fonts": [],
-    "moneyplex": [],
     "netperf": [],
     "nmap": [],
-    "opengreedy-data": [],
     "opera": [],
     "patterns-non_oss": [],
     "perlref": [],
-    "steam": [],
     "steamcmd": [],
     "stream": [],
     "unrar": [],
diff --git a/pkgs/meta/devel_packages b/pkgs/meta/devel_packages
index 4d26ad1..92fdca3 100644
--- a/pkgs/meta/devel_packages
+++ b/pkgs/meta/devel_packages
@@ -1,27 +1,20 @@
-7kaa-music games
 AdobeICCProfiles devel:openSUSE:Factory
 bladeRF-fpga-firmware hardware:sdr
 bladeRF-fx3-firmware hardware:sdr
 bpg-fonts M17N:fonts
-devilutionx games
 discord games:tools
 iozone benchmark
 ivtv-firmware hardware
 john-wordlists devel:openSUSE:Factory
-mikachan-fonts M17N:fonts
-moneyplex devel:openSUSE:Factory
 netperf benchmark
 nmap network:utilities
-opengreedy-data games
 opera devel:openSUSE:Factory
 patterns-non_oss system:install:head
 perlref devel:languages:perl
 Reaction-data games
 Reaction games
 steamcmd games:tools
-steam games:tools
 stream benchmark
-THE editors
 unrar Archiving
 wine-mono Emulators
 xv multimedia:apps