diff --git a/CompileHowto.txt b/CompileHowto.txt
index 86ca1405..da8f38c9 100644
--- a/CompileHowto.txt
+++ b/CompileHowto.txt
@@ -23,8 +23,10 @@ git submodule update
 mkdir "$HYPERION_DIR/build"
 cd "$HYPERION_DIR/build"
 
-# run cmake to generate make files on the raspberry pi
+# run cmake to generate make files on the raspberry pi WITHOUT PWM SUPPORT
 cmake  -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
+# run cmake to generate make files on the raspberry pi WITH PWM SUPPORT
+cmake -DENABLE_WS2812BPWM=ON -DENABLE_WS281XPWM=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
 # or if you are not compiling on the raspberry pi and need to disable the Dispmanx grabber and support for spi devices
 cmake -DENABLE_DISPMANX=OFF -DENABLE_SPIDEV=OFF -DENABLE_X11=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
 # as an alternative for the dispmanx grabber on non-rpi devices (e.g. cubox-i) you could try the framebuffer grabber
@@ -44,7 +46,7 @@ cmake -DENABLE_DISPMANX=OFF -DENABLE_SPIDEV=OFF -DENABLE_V4L2=OFF -DENABLE_OSX=O
 make
 # or if you have a system with more then 1 cpu core
 make -j 4
-# "4" is  the number of cpu cores (e.g. 4 on RPi2), this makes compile faster
+# "4" is  the number of cpu cores (e.g. 4 on RPi2 and RPi3), this makes compile faster
 
 #after compile, to remove any stuff not needed for a release version.
 strip bin/*
diff --git a/bin/create_all_releases.sh b/bin/create_all_releases.sh
index 99aba774..d4543a3e 100644
--- a/bin/create_all_releases.sh
+++ b/bin/create_all_releases.sh
@@ -17,7 +17,7 @@ cd ..
 # Create the RPI build
 mkdir build-rpi
 cd build-rpi
-cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-rpi.cmake" -DIMPORT_PROTOC=../build-x64/protoc_export.cmake -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
+cmake -DCMAKE_TOOLCHAIN_FILE="../Toolchain-rpi.cmake" -DIMPORT_PROTOC=../build-x64/protoc_export.cmake -DENABLE_WS2812BPWM=ON -DENABLE_WS281XPWM=ON -DCMAKE_BUILD_TYPE=Release -Wno-dev ..
 make -j 4
 cd ..
 
diff --git a/bin/hyperion-remote.sh b/bin/openelec/hyperion-remote.sh
similarity index 100%
rename from bin/hyperion-remote.sh
rename to bin/openelec/hyperion-remote.sh
diff --git a/bin/hyperiond.sh b/bin/openelec/hyperiond.sh
similarity index 100%
rename from bin/hyperiond.sh
rename to bin/openelec/hyperiond.sh
diff --git a/bin/hyperion.init.sh b/bin/service/hyperion.init.sh
similarity index 100%
rename from bin/hyperion.init.sh
rename to bin/service/hyperion.init.sh
diff --git a/bin/hyperion.initctl.sh b/bin/service/hyperion.initctl.sh
similarity index 100%
rename from bin/hyperion.initctl.sh
rename to bin/service/hyperion.initctl.sh
diff --git a/bin/hyperion.systemd.sh b/bin/service/hyperion.systemd.sh
similarity index 100%
rename from bin/hyperion.systemd.sh
rename to bin/service/hyperion.systemd.sh