diff --git a/cpp/SimpleDemo/Makefile b/cpp/SimpleDemo/Makefile
new file mode 100644
index 0000000..d4f144c
--- /dev/null
+++ b/cpp/SimpleDemo/Makefile
@@ -0,0 +1,2 @@
+all:
+	scons cpp_bindings="../../godot-cpp/" headers="../../godot-cpp/godot_headers/"
diff --git a/cpp/SimpleDemo/SConstruct b/cpp/SimpleDemo/SConstruct
index 677e5d6..4aaa8e1 100644
--- a/cpp/SimpleDemo/SConstruct
+++ b/cpp/SimpleDemo/SConstruct
@@ -11,8 +11,8 @@ env = Environment()
 if platform == "windows":
     env = Environment(ENV = os.environ)
 
-godot_headers_path = ARGUMENTS.get("headers", os.getenv("GODOT_HEADERS", "godot_headers"))
-godot_bindings_path = ARGUMENTS.get("cpp_bindings", os.getenv("CPP_BINDINGS", "cpp_bindings"))
+godot_headers_path = ARGUMENTS.get("headers", os.getenv("GODOT_HEADERS", "godot-cpp/godot_headers"))
+godot_bindings_path = ARGUMENTS.get("cpp_bindings", os.getenv("CPP_BINDINGS", "godot-cpp"))
 
 # default to debug build, must be same setting as used for cpp_bindings
 target = ARGUMENTS.get("target", "debug")
@@ -43,7 +43,11 @@ def add_sources(sources, dir):
 
 env.Append(CPPPATH=[godot_headers_path, godot_bindings_path + '/include', godot_bindings_path + '/include/gen/', godot_bindings_path + '/include/core/'])
 
-env.Append(LIBS=['godot-cpp.linux.64'])
+if target == "debug":
+    env.Append(LIBS=['libgodot-cpp.linux.debug.64'])
+else:
+    env.Append(LIBS=['libgodot-cpp.linux.release.64'])
+
 env.Append(LIBPATH=[ godot_bindings_path + '/bin/' ])
 
 sources = []
diff --git a/cpp/SimpleDemo/default_env.tres b/cpp/SimpleDemo/default_env.tres
index ad86b72..8edf1e3 100644
--- a/cpp/SimpleDemo/default_env.tres
+++ b/cpp/SimpleDemo/default_env.tres
@@ -65,6 +65,7 @@ ssao_radius2 = 0.0
 ssao_intensity2 = 1.0
 ssao_bias = 0.01
 ssao_light_affect = 0.0
+ssao_ao_channel_affect = 0.0
 ssao_color = Color( 0, 0, 0, 1 )
 ssao_quality = 0
 ssao_blur = 3
diff --git a/cpp/SimpleDemo/icon.png.import b/cpp/SimpleDemo/icon.png.import
new file mode 100644
index 0000000..45ee6af
--- /dev/null
+++ b/cpp/SimpleDemo/icon.png.import
@@ -0,0 +1,31 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+
+[deps]
+
+source_file="res://icon.png"
+dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/cpp/SimpleDemo/main.tscn b/cpp/SimpleDemo/main.tscn
index 6bfc815..4e2a607 100644
--- a/cpp/SimpleDemo/main.tscn
+++ b/cpp/SimpleDemo/main.tscn
@@ -10,12 +10,10 @@ resource_name = "SimpleSprite"
 class_name = "SimpleSprite"
 library = ExtResource( 3 )
 
-[node name="Node" type="Node" index="0"]
-
+[node name="Node" type="Node"]
 script = ExtResource( 1 )
 
-[node name="Button" type="Button" parent="." index="0"]
-
+[node name="Button" type="Button" parent="."]
 anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
@@ -25,6 +23,7 @@ margin_top = 208.0
 margin_right = 682.0
 margin_bottom = 325.0
 rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
 focus_mode = 2
 mouse_filter = 0
 mouse_default_cursor_shape = 0
@@ -38,8 +37,7 @@ text = "Press me"
 flat = false
 align = 1
 
-[node name="Label" type="Label" parent="." index="1"]
-
+[node name="Label" type="Label" parent="."]
 anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
@@ -49,6 +47,7 @@ margin_top = 360.0
 margin_right = 662.0
 margin_bottom = 374.0
 rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
 mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
@@ -58,11 +57,8 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[node name="Sprite" type="Sprite" parent="." index="2"]
-
+[node name="Sprite" type="Sprite" parent="."]
 texture = ExtResource( 2 )
 script = SubResource( 1 )
 
 [connection signal="pressed" from="Button" to="." method="_on_Button_pressed"]
-
-
diff --git a/cpp/SimpleDemo/project.godot b/cpp/SimpleDemo/project.godot
index 5ecfcee..6701a8c 100644
--- a/cpp/SimpleDemo/project.godot
+++ b/cpp/SimpleDemo/project.godot
@@ -6,7 +6,12 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=3
+config_version=4
+
+_global_script_classes=[  ]
+_global_script_class_icons={
+
+}
 
 [application]