diff --git a/data/control/Makefile.am b/data/control/Makefile.am
index be9f07876..38321743d 100644
--- a/data/control/Makefile.am
+++ b/data/control/Makefile.am
@@ -1,44 +1,22 @@
 installdir = $(CONTROLDIR)
 
-install_DATA = \
-	flash.start
-
-# install_DATA += \
-# 	audioplayer.start \
-# 	audioplayer.end \
-# 	deepstandby.on \
-# 	deepstandby.off \
-# 	flash.start \
-# 	inactivity.on \
-# 	movieplayer.start \
-# 	movieplayer.end \
-# 	neutrino.start \
-# 	pictureviewer.start \
-# 	pictureviewer.end \
-# 	recording.timer \
-# 	recording.start \
-# 	recording.end \
-# 	scan.start \
-# 	scan.stop \
-# 	standby.on \
-# 	standby.off
-#
-# install-data-hook:
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/audioplayer.start
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/audioplayer.end
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/deepstandby.on
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/deepstandby.off
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/flash.start
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/inactivity.on
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/movieplayer.start
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/movieplayer.end
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/neutrino.start
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/pictureviewer.start
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/pictureviewer.end
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/recording.timer
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/recording.start
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/recording.end
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/scan.start
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/scan.stop
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/standby.on
-# 	chmod 0755 $(DESTDIR)$(CONTROLDIR)/standby.off
+install_SCRIPTS = \
+	audioplayer.start \
+	audioplayer.end \
+	deepstandby.on \
+	deepstandby.off \
+	flash.start \
+	inactivity.on \
+	\
+	movieplayer.start \
+	movieplayer.end \
+	neutrino.start \
+	pictureviewer.start \
+	pictureviewer.end \
+	recording.timer \
+	recording.start \
+	recording.end \
+	scan.start \
+	scan.stop \
+	standby.on \
+	standby.off
diff --git a/data/inetradio/Makefile.am b/data/inetradio/Makefile.am
index 00c8470e2..41085dcbf 100644
--- a/data/inetradio/Makefile.am
+++ b/data/inetradio/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(CONFIGDIR)
 
-install_DATA = radio-favorites.xml radio-stations.xml
+install_DATA = \
+	radio-favorites.xml \
+	radio-stations.xml
diff --git a/data/initial/Makefile.am b/data/initial/Makefile.am
index 1099d2462..ae2722368 100644
--- a/data/initial/Makefile.am
+++ b/data/initial/Makefile.am
@@ -1,3 +1,10 @@
 installdir = $(CONFIGDIR)/initial
 
-install_DATA = bouquets.xml services.xml ubouquets.xml frontend.conf
+
+
+
+install_DATA = \
+	frontend.conf \
+	bouquets.xml \
+	services.xml \
+	ubouquets.xml
diff --git a/data/scripts/Makefile.am b/data/scripts/Makefile.am
index 9b1482f2e..3df2029b1 100644
--- a/data/scripts/Makefile.am
+++ b/data/scripts/Makefile.am
@@ -1,11 +1,17 @@
 installdir = $(bindir)
 
-install_DATA = \
+install_SCRIPTS = \
 	backup.sh \
 	restore.sh \
 	install.sh 
 
-install-data-hook:
-	chmod 0755 $(DESTDIR)$(bindir)/backup.sh
-	chmod 0755 $(DESTDIR)$(bindir)/restore.sh
-	chmod 0755 $(DESTDIR)$(bindir)/install.sh
+if BOXMODEL_CS_HD2
+install_SCRIPTS += \
+	backup_flash.sh \
+	restore_flash.sh
+endif
+
+if BOXTYPE_ARMBOX
+install_SCRIPTS += \
+	restore_flash.sh
+endif
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 4f5d723d7..104299b9a 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,10 +1,10 @@
-installdir = $(THEMESDIR)
-
 SUBDIRS = \
 	Grey-Blue/icons/buttons \
 	Neutrino-3.0/icons/buttons \
 	Olive-3.0/icons/buttons
 
+installdir = $(THEMESDIR)
+
 install_DATA = \
 	Bluemoon-3.0.theme \
 	Classic.theme \