diff --git a/.gitignore b/.gitignore
index 4062cae3..cf9e3b3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@
 /base/usr/python
 /base/usr/bin/*
 /base/usr/lib/*
+/base/usr/share/python-demos
 
 # Generic
 /base/usr/share/aclocal
diff --git a/util/fix-python.sh b/util/fix-python.sh
index c86a98cb..1a7ad7cf 100755
--- a/util/fix-python.sh
+++ b/util/fix-python.sh
@@ -42,7 +42,12 @@ pushd $HDD_PATH/usr
 		ln -s ../python/lib/libpython3.6m.so
 
 	popd
+
 popd
 
 echo "Installing readline hook..."
 cp util/readline._py $HDD_PATH/usr/python/lib/python3.6/
+
+echo "Installing demos..."
+mkdir -p base/usr/share/python-demos
+cp util/python-demos/*.py base/usr/share/python-demos/
diff --git a/base/usr/share/python-demos/about_applet.py b/util/python-demos/about_applet.py
similarity index 100%
rename from base/usr/share/python-demos/about_applet.py
rename to util/python-demos/about_applet.py
diff --git a/base/usr/share/python-demos/button.py b/util/python-demos/button.py
similarity index 100%
rename from base/usr/share/python-demos/button.py
rename to util/python-demos/button.py
diff --git a/base/usr/share/python-demos/calculator.py b/util/python-demos/calculator.py
similarity index 100%
rename from base/usr/share/python-demos/calculator.py
rename to util/python-demos/calculator.py
diff --git a/base/usr/share/python-demos/clock.py b/util/python-demos/clock.py
similarity index 100%
rename from base/usr/share/python-demos/clock.py
rename to util/python-demos/clock.py
diff --git a/base/usr/share/python-demos/dialog.py b/util/python-demos/dialog.py
similarity index 100%
rename from base/usr/share/python-demos/dialog.py
rename to util/python-demos/dialog.py
diff --git a/base/usr/share/python-demos/file_browser.py b/util/python-demos/file_browser.py
similarity index 100%
rename from base/usr/share/python-demos/file_browser.py
rename to util/python-demos/file_browser.py
diff --git a/base/usr/share/python-demos/fswait.py b/util/python-demos/fswait.py
similarity index 100%
rename from base/usr/share/python-demos/fswait.py
rename to util/python-demos/fswait.py
diff --git a/base/usr/share/python-demos/icon_cache.py b/util/python-demos/icon_cache.py
similarity index 100%
rename from base/usr/share/python-demos/icon_cache.py
rename to util/python-demos/icon_cache.py
diff --git a/base/usr/share/python-demos/input_box.py b/util/python-demos/input_box.py
similarity index 100%
rename from base/usr/share/python-demos/input_box.py
rename to util/python-demos/input_box.py
diff --git a/base/usr/share/python-demos/menu_bar.py b/util/python-demos/menu_bar.py
similarity index 100%
rename from base/usr/share/python-demos/menu_bar.py
rename to util/python-demos/menu_bar.py
diff --git a/base/usr/share/python-demos/mines.py b/util/python-demos/mines.py
similarity index 100%
rename from base/usr/share/python-demos/mines.py
rename to util/python-demos/mines.py
diff --git a/base/usr/share/python-demos/panel.py b/util/python-demos/panel.py
similarity index 100%
rename from base/usr/share/python-demos/panel.py
rename to util/python-demos/panel.py
diff --git a/base/usr/share/python-demos/progress-bar.py b/util/python-demos/progress-bar.py
similarity index 100%
rename from base/usr/share/python-demos/progress-bar.py
rename to util/python-demos/progress-bar.py
diff --git a/base/usr/share/python-demos/text_region.py b/util/python-demos/text_region.py
similarity index 100%
rename from base/usr/share/python-demos/text_region.py
rename to util/python-demos/text_region.py
diff --git a/base/usr/share/python-demos/toaru_fonts.py b/util/python-demos/toaru_fonts.py
similarity index 100%
rename from base/usr/share/python-demos/toaru_fonts.py
rename to util/python-demos/toaru_fonts.py
diff --git a/base/usr/share/python-demos/toaru_theme.py b/util/python-demos/toaru_theme.py
similarity index 100%
rename from base/usr/share/python-demos/toaru_theme.py
rename to util/python-demos/toaru_theme.py
diff --git a/base/usr/share/python-demos/weather_tool.py b/util/python-demos/weather_tool.py
similarity index 100%
rename from base/usr/share/python-demos/weather_tool.py
rename to util/python-demos/weather_tool.py
diff --git a/base/usr/share/python-demos/yutani.py b/util/python-demos/yutani.py
similarity index 100%
rename from base/usr/share/python-demos/yutani.py
rename to util/python-demos/yutani.py
diff --git a/base/usr/share/python-demos/yutani_mainloop.py b/util/python-demos/yutani_mainloop.py
similarity index 100%
rename from base/usr/share/python-demos/yutani_mainloop.py
rename to util/python-demos/yutani_mainloop.py