diff --git a/demo/build.hxml b/demo/build.hxml
index 739d592..0d50fb7 100755
--- a/demo/build.hxml
+++ b/demo/build.hxml
@@ -1,7 +1,8 @@
 -cp src
--cp ../src/main
+#-cp ../src/main
 -lib yaml
 -lib promhx
+-lib haxework
 --macro haxework.parser.Parser.auto()
 -debug
 -D native_trace
diff --git a/demo/project.xml b/demo/project.xml
index fe7a135..a0aaafc 100644
--- a/demo/project.xml
+++ b/demo/project.xml
@@ -7,14 +7,14 @@
     <source path="../src/main"/>
     <source path="src"/>
     <assets path="src" rename="image" include="*.png"/>
-    
-    <haxelib name="lime" version="7.3.0"/>
-    <haxelib name="openfl" version="8.9.0"/>
-    <haxelib name="hxcpp" version="4.0.8"/>
-    <haxelib name="promhx" version="1.1.0"/>
-    <haxelib name="yaml" version="1.3.0"/>
 
-    <haxeflag name="--macro" value="haxework.parser.Parser.auto()"/>
+    <haxelib name="lime" version=""/>
+    <haxelib name="openfl" version=""/>
+    <haxelib name="hxcpp" version=""/>
+    <!--<haxelib name="promhx" version=""/>-->
+    <haxelib name="haxework" version="git"/>
+
+    <!--<haxeflag name="&#45;&#45;macro" value="haxework.parser.Parser.auto()"/>-->
     <haxeflag name="--macro" value="CompilationOption.set('build','xxx')"/>
 
     <window fps="30"/>
diff --git a/demo/run.sh b/demo/run.sh
index 1281eed..a7d285b 100755
--- a/demo/run.sh
+++ b/demo/run.sh
@@ -2,6 +2,6 @@
 SDK_PATH=~/sdk
 echo "`pwd`/target" > ~/.macromedia/Flash_Player/#Security/FlashPlayerTrust/haxework_demo.cfg
 . ${SDK_PATH}/neko/2.2.0/activate
-. ${SDK_PATH}/haxe/3.4.7/activate
+. ${SDK_PATH}/haxe/4.0.5/activate
 haxe build.hxml && ${SDK_PATH}/flashplayer/32/flashplayerdebugger target/demo.swf &
 tail -f ~/.macromedia/Flash_Player/Logs/flashlog.txt
diff --git a/demo/run_openfl.sh b/demo/run_openfl.sh
index e41d797..85d21ce 100755
--- a/demo/run_openfl.sh
+++ b/demo/run_openfl.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
+SDK_PATH=~/sdk
 echo "`pwd`/target/flash/bin" > ~/.macromedia/Flash_Player/#Security/FlashPlayerTrust/haxework_demo.cfg
-. /opt/sdk/neko/2.2.0/activate
-. /opt/sdk/haxe/3.4.7/activate
-haxelib run openfl test flash
+. ${SDK_PATH}/neko/2.2.0/activate
+. ${SDK_PATH}/haxe/4.0.5/activate
+#haxelib run openfl test flash
+haxelib run openfl test html5
diff --git a/demo/src/demo/Demo.hx b/demo/src/demo/Demo.hx
index 92ec764..4ea3221 100644
--- a/demo/src/demo/Demo.hx
+++ b/demo/src/demo/Demo.hx
@@ -1,5 +1,6 @@
 package demo;
 
+import demo.storage.TestStorage;
 import haxework.resources.IResources;
 import haxework.provider.Provider;
 import demo.dispatch.DemoDispatcher;
@@ -46,14 +47,18 @@ import haxework.view.group.VGroupView;
 class Demo extends App implements DemoListener {
 
     @:provide static var resources:IResources;
+    @:provide static var storage:TestStorage;
 
     public static function main() {
         L.push(new TraceLogger());
 
-        var app = new Demo(new AppTheme());
         resources.image.put("logo", HaxeLogo.resolve());
+        var app = new Demo(new AppTheme(), resources.image.get("logo"));
         app.start(new DemoView());
 
+        trace(storage);
+        storage.write("test", "value");
+
         var dispatcher = new DemoDispatcher();
         dispatcher.connect(app);
         dispatcher.test1Signal.emit();
diff --git a/demo/src/demo/popup/FontPopup.hx b/demo/src/demo/popup/FontPopup.hx
index 3077705..a3da228 100644
--- a/demo/src/demo/popup/FontPopup.hx
+++ b/demo/src/demo/popup/FontPopup.hx
@@ -23,7 +23,7 @@ class FontLabelView extends LabelListItem<ThemeFont> {
 
     @:view var fonts:ListView<ThemeFont>;
 
-    private function new():Void {
+    public function new():Void {
         super();
         var values:Array<ThemeFont> = Font.enumerateFonts(true).map(function(font:Font) {
             return {
diff --git a/demo/src/demo/storage/TestStorage.hx b/demo/src/demo/storage/TestStorage.hx
new file mode 100644
index 0000000..8e7db14
--- /dev/null
+++ b/demo/src/demo/storage/TestStorage.hx
@@ -0,0 +1,10 @@
+package demo.storage;
+
+import haxework.storage.SharedObjectStorage;
+
+@:provide class TestStorage extends SharedObjectStorage {
+
+    public function new() {
+        super("test");
+    }
+}