diff --git a/make/environment.mk b/make/environment.mk
index b67c85a2..0425798a 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -295,17 +295,17 @@ NI_NEUTRINO_BRANCH	?= ni/tuxbox
 ifeq ($(USE_LIBSTB-HAL), yes)
   NI_NEUTRINO_BRANCH	:= ni/mp/tuxbox
 endif
-
 NI_NEUTRINO-PLUGINS	= ni-neutrino-plugins
+
 BUILD-GENERIC-PC	= build-generic-pc
 NI_BUILD-GENERIC-PC	= ni-build-generic-pc
-
+NI_DRIVERS-BIN		= ni-drivers-bin
 NI_LIBSTB-HAL		= ni-libstb-hal
-NI_STREAMRIPPER		= ni-streamripper
-NI_OFGWRITE		= ni-ofgwrite
-
 NI_LINUX-KERNEL		= ni-linux-kernel
-NI_DRIVERS-BIN		= ni-drivers-bin
+NI_LOGO-STUFF		= ni-logo-stuff
+NI_OFGWRITE		= ni-ofgwrite
+NI_OPENTHREADS		= ni-openthreads
+NI_STREAMRIPPER		= ni-streamripper
 
 # ffmpeg/master is currently not mature enough for daily use
 # if you want to help testing you can enable it here
@@ -313,19 +313,12 @@ NI_FFMPEG		= ni-ffmpeg
 NI_FFMPEG_BRANCH	= ni/ffmpeg/2.8
 #NI_FFMPEG_BRANCH	= ni/ffmpeg/master
 
-NI_OPENTHREADS		= ni-openthreads
-
 TUXBOX_GIT		= $(GITHUB)/tuxbox-neutrino
 TUXBOX_NEUTRINO		= gui-neutrino
 TUXBOX_NEUTRINO_BRANCH	?= master
-
 TUXBOX_LIBSTB-HAL	= library-stb-hal
-
 TUXBOX_REMOTE_REPO	= tuxbox
 
-# various
-NI_LOGO_STUFF		= ni-logo-stuff
-
 # execute local scripts
 define local-script
 	@if [ -x $(LOCAL_DIR)/scripts/$(1) ]; then \
diff --git a/make/plugins.mk b/make/plugins.mk
index 0e9577c0..a27a6015 100644
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -77,11 +77,11 @@ plugins-all: $(D)/neutrino \
 ### plugins  ###
 ################
 
-channellogos: $(SOURCE_DIR)/$(NI_LOGO_STUFF) $(SHAREICONS)
+channellogos: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(SHAREICONS)
 	rm -rf $(SHAREICONS)/logo
 	mkdir -p $(SHAREICONS)/logo
-	install -m644 $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logos/* $(SHAREICONS)/logo
-	pushd $(SOURCE_DIR)/$(NI_LOGO_STUFF)/ && \
+	install -m644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logos/* $(SHAREICONS)/logo
+	pushd $(SOURCE_DIR)/$(NI_LOGO-STUFF)/ && \
 	./logo_linker.sh complete.db $(SHAREICONS)/logo
 
 lcd4linux-all: $(D)/lcd4linux | $(TARGETPREFIX)
@@ -170,10 +170,10 @@ autoreboot: $(LIBPLUG)
 	install -m755 $(SOURCES)/$@/*.sh $(LIBPLUG)/
 	install -m644 $(SOURCES)/$@/*.cfg $(LIBPLUG)/
 
-logo-addon: $(SOURCE_DIR)/$(NI_LOGO_STUFF) $(LIBPLUG)
-	install -m755 $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-addon/*.sh $(LIBPLUG)/
-	install -m644 $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-addon/*.cfg $(LIBPLUG)/
-	install -m644 $(SOURCE_DIR)/$(NI_LOGO_STUFF)/logo-addon/*.png $(LIBPLUG)/
+logo-addon: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(LIBPLUG)
+	install -m755 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.sh $(LIBPLUG)/
+	install -m644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.cfg $(LIBPLUG)/
+	install -m644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.png $(LIBPLUG)/
 
 smarthomeinfo: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUG) $(VARCONF)
 	cp -a $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/$@/plugin/tuxbox/plugins/* $(LIBPLUG)/
diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index fe35770c..9abd46a4 100644
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -81,11 +81,11 @@ $(SOURCE_DIR)/$(NI_OFGWRITE):
 		git remote add upstream https://github.com/oe-alliance/ofgwrite.git && \
 		git fetch --all
 
-$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \
 $(SOURCE_DIR)/$(NI_DRIVERS-BIN) \
-$(SOURCE_DIR)/$(NI_LOGO_STUFF) \
-$(SOURCE_DIR)/$(NI_STREAMRIPPER) \
-$(SOURCE_DIR)/$(NI_OPENTHREADS):
+$(SOURCE_DIR)/$(NI_LOGO-STUFF) \
+$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \
+$(SOURCE_DIR)/$(NI_OPENTHREADS) \
+$(SOURCE_DIR)/$(NI_STREAMRIPPER):
 	cd $(SOURCE_DIR) && \
 		git clone $(NI_GIT)/$(notdir $@).git
 
@@ -177,13 +177,13 @@ neutrino-hd-source: $(N_HD_SOURCE)
 
 ni-git: \
 	$(BUILD-GENERIC-PC) \
-	$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \
-	$(SOURCE_DIR)/$(NI_LIBSTB-HAL) \
-	$(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) \
 	$(SOURCE_DIR)/$(NI_DRIVERS-BIN) \
 	$(SOURCE_DIR)/$(NI_FFMPEG) \
+	$(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) \
+	$(SOURCE_DIR)/$(NI_LIBSTB-HAL) \
 	$(SOURCE_DIR)/$(NI_LINUX-KERNEL) \
-	$(SOURCE_DIR)/$(NI_LOGO_STUFF) \
-	$(SOURCE_DIR)/$(NI_STREAMRIPPER) \
+	$(SOURCE_DIR)/$(NI_LOGO-STUFF) \
+	$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \
 	$(SOURCE_DIR)/$(NI_OFGWRITE) \
-	$(SOURCE_DIR)/$(NI_OPENTHREADS)
+	$(SOURCE_DIR)/$(NI_OPENTHREADS) \
+	$(SOURCE_DIR)/$(NI_STREAMRIPPER)
diff --git a/make/update.mk b/make/update.mk
index 0e060f13..c6edc916 100644
--- a/make/update.mk
+++ b/make/update.mk
@@ -43,18 +43,19 @@ update-ni-force:
 
 update-ni-git:
 	cd $(BUILD-GENERIC-PC) && git pull
-	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && git pull --all && git checkout $(KBRANCH)
 	cd $(SOURCE_DIR)/$(NI_DRIVERS-BIN) && git pull
+	cd $(SOURCE_DIR)/$(NI_FFMPEG) && git pull --all && git checkout $(NI_FFMPEG_BRANCH)
 ifeq ($(HAS_LIBCS), yes)
 	cd $(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) && git pull --all && git checkout $(NI_LIBCOOLSTREAM_BRANCH)
 endif
-	cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && git pull
 	cd $(SOURCE_DIR)/$(NI_LIBSTB-HAL) && git pull
-	cd $(SOURCE_DIR)/$(NI_FFMPEG) && git pull --all && git checkout $(NI_FFMPEG_BRANCH)
-	cd $(SOURCE_DIR)/$(NI_LOGO_STUFF) && git pull
-	cd $(SOURCE_DIR)/$(NI_STREAMRIPPER) && git pull
+	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && git pull --all && git checkout $(KBRANCH)
+	cd $(SOURCE_DIR)/$(NI_LOGO-STUFF) && git pull
+	cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && git pull
 	cd $(SOURCE_DIR)/$(NI_OFGWRITE) && git pull
 	cd $(SOURCE_DIR)/$(NI_OPENTHREADS) && git pull
+	cd $(SOURCE_DIR)/$(NI_STREAMRIPPER) && git pull
+
 
 update-ni:
 	make update-self
@@ -70,18 +71,18 @@ ifeq ($(HAS_INTERNALS), yes)
 endif
 	cd $(N_HD_SOURCE) && git push
 	cd $(BUILD-GENERIC-PC) && git push
-	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && git push --all
 	cd $(SOURCE_DIR)/$(NI_DRIVERS-BIN) && git push
+	cd $(SOURCE_DIR)/$(NI_FFMPEG) && git push
 ifeq ($(HAS_LIBCS), yes)
 	cd $(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) && git push --all
 endif
-	cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && git push
 	cd $(SOURCE_DIR)/$(NI_LIBSTB-HAL) && git push
-	cd $(SOURCE_DIR)/$(NI_FFMPEG) && git push
-	cd $(SOURCE_DIR)/$(NI_LOGO_STUFF) && git push
-	cd $(SOURCE_DIR)/$(NI_STREAMRIPPER) && git push
+	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && git push --all
+	cd $(SOURCE_DIR)/$(NI_LOGO-STUFF) && git push
+	cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && git push
 	cd $(SOURCE_DIR)/$(NI_OFGWRITE) && git push
 	cd $(SOURCE_DIR)/$(NI_OPENTHREADS) && git push
+	cd $(SOURCE_DIR)/$(NI_STREAMRIPPER) && git push
 
 PHONY += update-self update-neutrino
 PHONY += update-ni-git update-remotes