diff --git a/.gitignore b/.gitignore
index 91fe5638..fd3871fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,6 +100,7 @@ doc/tutorial/11_fractal
 doc/tutorial/12_voronoi
 doc/tutorial/13_shader_builder
 doc/tutorial/14_lol_lua
+doc/tutorial/15_lolimgui
 tools/make-font
 # Our data
 doc/doxygen.cfg
@@ -124,4 +125,4 @@ tools/vslol/obj/*/*/*
 tools/vslol/obj/*/*/*
 tools/vslol/*.suo
 # Built stuff
-binaries/
\ No newline at end of file
+binaries/
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index b5c5cee3..c6f9cb1a 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/build/autotools/common.am
 if BUILD_TUTORIAL
 noinst_PROGRAMS = 01_triangle 02_cube 03_noise 04_texture 05_easymesh \
                   06_sprite 07_input 08_fbo 09_sound 11_fractal \
-                  12_voronoi 13_shader_builder 14_lol_lua
+                  12_voronoi 13_shader_builder 14_lol_lua 15_lolimgui
 endif
 
 01_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
@@ -65,3 +65,7 @@ endif
 14_lol_lua_CPPFLAGS = $(AM_CPPFLAGS)
 14_lol_lua_DEPENDENCIES = @LOL_DEPS@
 
+15_lolimgui_SOURCES = 15_lolimgui.cpp
+15_lolimgui_CPPFLAGS = $(AM_CPPFLAGS)
+15_lolimgui_DEPENDENCIES = @LOL_DEPS@
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 7d92b444..27d332cd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,11 +14,12 @@ liblol_core_a_SOURCES = \
     numeric.h utils.h messageservice.cpp messageservice.h \
     gradient.cpp gradient.h gradient.lolfx \
     platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \
-    light.cpp light.h lolimgui.cpp lolimgui.h \
+    light.cpp light.h \
     \
     $(liblol_core_headers) \
     $(liblol_core_sources) \
     \
+    $(imgui_sources) \
     $(nacl_sources) \
     $(sdl_sources) \
     $(d3d9_sources) \
@@ -143,6 +144,12 @@ sdl_sources = \
 d3d9_sources = \
     platform/d3d9/d3d9input.cpp platform/d3d9/d3d9input.h
 
+imgui_sources = \
+    lolimgui.cpp lolimgui.h \
+    3rdparty/imgui/imgui_demo.cpp \
+    3rdparty/imgui/imgui_draw.cpp \
+    $(NULL)
+
 if LOL_USE_NACL
 nacl_sources = \
     platform/nacl/nacl-app.cpp platform/nacl/nacl-app.h \
diff --git a/src/lol-core.vcxproj b/src/lol-core.vcxproj
index 954bdd1c..c961ddf5 100644
--- a/src/lol-core.vcxproj
+++ b/src/lol-core.vcxproj
@@ -386,7 +386,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="bullet\lol-bullet.vcxproj">
+    <ProjectReference Include="3rdparty\lol-bullet.vcxproj">
       <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
     </ProjectReference>
     <ProjectReference Include="3rdparty\lol-lua.vcxproj">
@@ -397,4 +397,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(LolDir)\build\msbuild\lolfx.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>