diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e2d316f..0109cb4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true" buildAllGenerated="true">
+  <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true">
     <generated>
+      <config projectName="3EngineGlobal" targetName="Tangram3D" />
+      <config projectName="3EngineGlobal" targetName="AppImage" />
+      <config projectName="3EngineGlobal" targetName="CopyFilesExe" />
       <config projectName="3EngineGlobal" targetName="CopyFilesEngine" />
-      <config projectName="3EngineGlobal" targetName="3Engine" />
+      <config projectName="3EngineGlobal" targetName="3EngineTests" />
       <config projectName="3EngineGlobal" targetName="TimeShaders" />
       <config projectName="3EngineGlobal" targetName="LightScene" />
-      <config projectName="3EngineGlobal" targetName="Tangram3D" />
+      <config projectName="3EngineGlobal" targetName="3Engine" />
       <config projectName="3EngineGlobal" targetName="CopyFilesTests" />
-      <config projectName="3EngineGlobal" targetName="CopyFilesExe" />
-      <config projectName="3EngineGlobal" targetName="3EngineTests" />
     </generated>
   </component>
   <component name="CMakeSettings" AUTO_RELOAD="true">
@@ -20,15 +21,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6f14e751-0902-47e1-a07f-fb9a4fa0058b" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/3Engine/src/Actor.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/3Engine/src/Actor.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/3Engine/src/Debug.h" beforeDir="false" afterPath="$PROJECT_DIR$/3Engine/src/Debug.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/3Engine/src/Engine.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/3Engine/src/Engine.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/3Engine/src/OpenGLUtils.h" beforeDir="false" afterPath="$PROJECT_DIR$/3Engine/src/OpenGLUtils.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/3Engine/src/Shader/ShaderProgram.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/3Engine/src/Shader/ShaderProgram.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake/FindSDL2.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake/FindSDL2.cmake" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/BuildTools/AppImage/build.sh" beforeDir="false" afterPath="$PROJECT_DIR$/BuildTools/AppImage/build.sh" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
     <ignored path="$PROJECT_DIR$/bin/release/" />
@@ -44,97 +39,30 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
-  <component name="FUSProjectUsageTrigger">
-    <session id="579781361">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="2" />
-          <entry key="project.open.time.13" value="1" />
-          <entry key="project.open.time.27" value="1" />
-          <entry key="project.open.time.53" value="1" />
-          <entry key="project.opened" value="3" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="cmake" value="4" />
-          <entry key="cpp" value="1207" />
-          <entry key="glsl" value="14" />
-          <entry key="h" value="75" />
-          <entry key="json" value="4" />
-          <entry key="md" value="259" />
-          <entry key="mm" value="5" />
-          <entry key="txt" value="38" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CMakeLists.txt" value="42" />
-          <entry key="GLSL shader file" value="14" />
-          <entry key="JSON" value="4" />
-          <entry key="Markdown" value="259" />
-          <entry key="ObjectiveC" value="1287" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="cmake" value="2" />
-          <entry key="cpp" value="10" />
-          <entry key="glsl" value="7" />
-          <entry key="h" value="2" />
-          <entry key="hpp" value="1" />
-          <entry key="json" value="1" />
-          <entry key="md" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CMakeLists.txt" value="2" />
-          <entry key="GLSL shader file" value="6" />
-          <entry key="JSON" value="1" />
-          <entry key="Markdown" value="1" />
-          <entry key="ObjectiveC" value="13" />
-          <entry key="PLAIN_TEXT" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.cidr.testingFrameworks.usages" />
-      <usages-collector id="statistics.vcs.git.usages" />
-    </session>
-  </component>
   <component name="FavoritesManager">
     <favorites_list name="ThreeEngine" />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/3Engine/src/Debug.h">
+        <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="222">
-              <caret line="28" selection-start-line="28" selection-end-line="28" />
-              <folding>
-                <element signature="e#169#188#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="872">
+              <caret line="50" selection-start-line="50" selection-end-line="51" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/3Engine/src/Shader/ShaderProgram.cpp">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-350">
-              <caret line="188" column="87" selection-start-line="188" selection-start-column="87" selection-end-line="188" selection-end-column="87" />
-              <folding>
-                <element signature="e#7328#8279#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/BuildTools/AppImage/cpld.sh">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/3Engine/src/Shapes/Mesh.cpp">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/BuildTools/AppImage/build.sh">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="442">
-              <caret line="110" selection-start-line="110" selection-end-line="110" />
+            <state relative-caret-position="62">
+              <caret line="44" column="40" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" />
             </state>
           </provider>
         </entry>
@@ -142,8 +70,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/3Engine/src/Actor.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="498">
-              <caret line="69" column="17" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
+            <state relative-caret-position="2059">
+              <caret line="71" column="13" selection-start-line="71" selection-start-column="13" selection-end-line="71" selection-end-column="13" />
               <folding>
                 <element signature="e#114#134#0" expanded="true" />
               </folding>
@@ -154,7 +82,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/3EngineExecutable/src/Tangram3D/Tangram3D.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="426">
+            <state relative-caret-position="2784">
               <caret line="96" column="15" selection-start-line="96" selection-start-column="15" selection-end-line="96" selection-end-column="15" />
             </state>
           </provider>
@@ -163,7 +91,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/3Engine/src/Utilities/json.hpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="222">
+            <state relative-caret-position="336574">
               <caret line="11606" selection-start-line="11606" selection-end-line="11606" />
             </state>
           </provider>
@@ -172,7 +100,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/3Engine/shaders/Color3D/vertex.glsl">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
+            <state relative-caret-position="377">
               <caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
             </state>
           </provider>
@@ -181,7 +109,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/3Engine/shaders/Color3D/fragment.glsl">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
+            <state relative-caret-position="232">
               <caret line="8" column="26" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="26" />
             </state>
           </provider>
@@ -190,7 +118,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/3EngineExecutable/src/LightScene/LightScene.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
+            <state relative-caret-position="3335">
               <caret line="115" selection-start-line="115" selection-end-line="115" />
             </state>
           </provider>
@@ -309,7 +237,6 @@
         <option value="$PROJECT_DIR$/3EngineTests/src/VectorTests.h" />
         <option value="$PROJECT_DIR$/3EngineTests/src/MatrixTests.h" />
         <option value="$PROJECT_DIR$/BuildTools/AppImage/3Engine.AppDir/3Engine.desktop" />
-        <option value="$PROJECT_DIR$/BuildTools/AppImage/build.sh" />
         <option value="$PROJECT_DIR$/3EngineTests/CMakeLists.txt" />
         <option value="$PROJECT_DIR$/3Engine/CMakeLists.txt" />
         <option value="$PROJECT_DIR$/.gitignore" />
@@ -327,11 +254,10 @@
         <option value="$PROJECT_DIR$/3Engine/shaders/Color3D/fragment.glsl" />
         <option value="$PROJECT_DIR$/3EngineExecutable/src/Tangram3D/Tangram3D.cpp" />
         <option value="$PROJECT_DIR$/3Engine/src/Shader/ShaderProgram.cpp" />
+        <option value="$PROJECT_DIR$/BuildTools/AppImage/build.sh" />
       </list>
     </option>
   </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsFlowSettings">
     <service-enabled>true</service-enabled>
     <exe-path />
@@ -339,15 +265,12 @@
     <other-services-enabled>true</other-services-enabled>
     <auto-save>true</auto-save>
   </component>
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
   <component name="OCFindUsagesOptions" text="false" ivars="false" properties="true" derivedClasses="false" />
   <component name="ProjectFrameBounds">
-    <option name="y" value="23" />
-    <option name="width" value="2048" />
-    <option name="height" value="1062" />
+    <option name="x" value="1434" />
+    <option name="y" value="116" />
+    <option name="width" value="2393" />
+    <option name="height" value="1616" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="1" id="Add" />
@@ -367,68 +290,20 @@
             <path>
               <item name="3EngineGlobal" type="b2602c69:ProjectViewProjectNode" />
               <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="3EngineGlobal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="shaders" type="462c0819:PsiDirectoryNode" />
+              <item name="BuildTools" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="3EngineGlobal" type="b2602c69:ProjectViewProjectNode" />
               <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="shaders" type="462c0819:PsiDirectoryNode" />
-              <item name="BRDF" type="462c0819:PsiDirectoryNode" />
+              <item name="BuildTools" type="462c0819:PsiDirectoryNode" />
+              <item name="AppImage" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="3EngineGlobal" type="b2602c69:ProjectViewProjectNode" />
               <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="shaders" type="462c0819:PsiDirectoryNode" />
-              <item name="Color3D" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="3EngineGlobal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="shaders" type="462c0819:PsiDirectoryNode" />
-              <item name="SkySphere" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="3EngineGlobal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="3EngineExecutable" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="3EngineGlobal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="3EngineExecutable" type="462c0819:PsiDirectoryNode" />
-              <item name="shaders" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="3EngineGlobal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="3EngineExecutable" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="3EngineGlobal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="3EngineExecutable" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="Tangram3D" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="3EngineGlobal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="3EngineTests" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="3EngineGlobal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="3Engine" type="462c0819:PsiDirectoryNode" />
-              <item name="cmake" type="462c0819:PsiDirectoryNode" />
+              <item name="BuildTools" type="462c0819:PsiDirectoryNode" />
+              <item name="AppImage" type="462c0819:PsiDirectoryNode" />
+              <item name="3Engine.AppDir" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -475,15 +350,17 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.LightScene">
+  <component name="RunManager" selected="Application.AppImage">
     <configuration name="3Engine Tests" type="CMakeCatchTestRunConfigurationType" factoryName="Catch Test" PASS_PARENT_ENVS_2="true" PROJECT_NAME="3EngineGlobal" TARGET_NAME="3EngineTests" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="3EngineGlobal" RUN_TARGET_NAME="3EngineTests" TEST_MODE="SUITE_TEST">
       <method v="2">
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+        <option name="BeforeTestRunTask" enabled="true" />
       </method>
     </configuration>
     <configuration default="true" type="CMakeCatchTestRunConfigurationType" factoryName="Catch Test" PASS_PARENT_ENVS_2="true" PROJECT_NAME="3EngineGlobal" TARGET_NAME="ThreeEngineTests" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="3EngineGlobal" RUN_TARGET_NAME="ThreeEngineTests" TEST_MODE="SUITE_TEST">
       <method v="2">
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+        <option name="BeforeTestRunTask" enabled="true" />
       </method>
     </configuration>
     <configuration name="3Engine" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS_2="true" PROJECT_NAME="3EngineGlobal" TARGET_NAME="3Engine" CONFIG_NAME="Debug">
@@ -491,6 +368,11 @@
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
       </method>
     </configuration>
+    <configuration name="AppImage" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS_2="true" PROJECT_NAME="3EngineGlobal" TARGET_NAME="AppImage" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="Build All" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS_2="true" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="3EngineGlobal" RUN_TARGET_NAME="LightScene" EXPLICIT_BUILD_TARGET_NAME="all">
       <method v="2">
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
@@ -528,7 +410,6 @@
     </configuration>
     <list>
       <item itemvalue="Application.Build All" />
-      <item itemvalue="Catch.3Engine Tests" />
       <item itemvalue="Application.3Engine" />
       <item itemvalue="Application.CopyFilesEngine" />
       <item itemvalue="Application.CopyFilesExe" />
@@ -536,6 +417,8 @@
       <item itemvalue="Application.Tangram3D" />
       <item itemvalue="Application.TimeShaders" />
       <item itemvalue="Application.CopyFilesTests" />
+      <item itemvalue="Application.AppImage" />
+      <item itemvalue="Catch.3Engine Tests" />
     </list>
   </component>
   <component name="SvnConfiguration">
@@ -612,6 +495,9 @@
       <workItem from="1537442968734" duration="8897000" />
       <workItem from="1537458637291" duration="813000" />
       <workItem from="1537459495453" duration="3307000" />
+      <workItem from="1538320780332" duration="16000" />
+      <workItem from="1538332975558" duration="165000" />
+      <workItem from="1550625397671" duration="910000" />
     </task>
     <servers />
   </component>
@@ -633,7 +519,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="380681000" />
+    <option name="totallyTimeSpent" value="381772000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -645,20 +531,19 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="2048" height="1062" extended-state="0" />
-    <editor active="true" />
+    <frame x="1434" y="116" width="2393" height="1616" extended-state="0" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4993036" visible="true" weight="0.16999003" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4993036" visible="true" weight="0.24122997" />
       <window_info id="Structure" order="1" sideWeight="0.50069636" side_tool="true" weight="0.1627047" />
       <window_info id="Favorites" order="2" sideWeight="0.50069636" side_tool="true" weight="0.1627047" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32922912" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.32790697" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.5131579" visible="true" weight="0.26391754" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.5131579" weight="0.26391754" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.4667011" side_tool="true" weight="0.20787401" />
-      <window_info anchor="bottom" id="Messages" order="7" sideWeight="0.66959214" weight="0.27525774" />
+      <window_info active="true" anchor="bottom" id="Messages" order="7" sideWeight="0.66959214" visible="true" weight="0.27520236" />
       <window_info anchor="bottom" id="CMake" order="8" sideWeight="0.620031" weight="0.2783505" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.4868421" side_tool="true" weight="0.2960373" />
       <window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.49973586" weight="0.32961783" />
@@ -697,9 +582,6 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
   <component name="VcsManagerConfiguration">
     <ignored-roots>
       <path value="$PROJECT_DIR$/.." />
@@ -759,7 +641,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/shaders/Default/fragment.glsl" />
     <entry file="file://$PROJECT_DIR$/shaders/SimpleCubemapping/vertex.glsl" />
     <entry file="file://$PROJECT_DIR$/shaders/SimpleCubemapping/program.json" />
     <entry file="file://$PROJECT_DIR$/src/Executable/Tangram/Tangram.cpp" />
@@ -847,13 +728,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/BuildTools/AppImage/build.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="648">
-          <caret line="36" column="21" selection-start-line="36" selection-start-column="21" selection-end-line="36" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/BuildTools/AppImage/3Engine.AppDir/AppRun">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="216">
@@ -868,13 +742,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1260">
-          <caret line="70" column="24" selection-start-line="70" selection-start-column="10" selection-end-line="70" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/cmake/FindSDL2.cmake">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2772">
@@ -886,9 +753,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1836">
           <caret line="102" column="27" selection-start-line="102" selection-start-column="27" selection-end-line="102" selection-end-column="27" />
-          <folding>
-            <element signature="e#119#137#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -913,9 +777,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
           <caret line="21" column="20" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
-          <folding>
-            <element signature="e#122#143#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -949,78 +810,89 @@
     <entry file="file://$PROJECT_DIR$/3Engine/shaders/SkySphere/fragment.glsl">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/3EngineExecutable/src/LightScene/LightScene.cpp">
+    <entry file="file://$PROJECT_DIR$/3Engine/src/Debug.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="115" selection-start-line="115" selection-end-line="115" />
+        <state relative-caret-position="504">
+          <caret line="29" selection-start-line="29" selection-end-line="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/3EngineExecutable/shaders/Default/fragment.glsl">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/3Engine/src/Shader/ShaderProgram.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6293">
+          <caret line="217" column="67" selection-start-line="217" selection-start-column="67" selection-end-line="217" selection-end-column="67" />
+        </state>
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/3Engine/src/Shapes/Mesh.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
+        <state relative-caret-position="3190">
           <caret line="110" selection-start-line="110" selection-end-line="110" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/3Engine/src/Actor.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2059">
+          <caret line="71" column="13" selection-start-line="71" selection-start-column="13" selection-end-line="71" selection-end-column="13" />
+          <folding>
+            <element signature="e#114#134#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/3EngineExecutable/src/Tangram3D/Tangram3D.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2784">
+          <caret line="96" column="15" selection-start-line="96" selection-start-column="15" selection-end-line="96" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/3Engine/src/Utilities/json.hpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="222">
+        <state relative-caret-position="336574">
           <caret line="11606" selection-start-line="11606" selection-end-line="11606" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/3Engine/shaders/Color3D/vertex.glsl">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
+        <state relative-caret-position="377">
           <caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/3Engine/shaders/Color3D/fragment.glsl">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
+        <state relative-caret-position="232">
           <caret line="8" column="26" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/3Engine/src/Debug.h">
+    <entry file="file://$PROJECT_DIR$/3EngineExecutable/src/LightScene/LightScene.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="222">
-          <caret line="28" selection-start-line="28" selection-end-line="28" />
-          <folding>
-            <element signature="e#169#188#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="3335">
+          <caret line="115" selection-start-line="115" selection-end-line="115" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/3Engine/src/Actor.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="498">
-          <caret line="69" column="17" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
-          <folding>
-            <element signature="e#114#134#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/3EngineExecutable/shaders/Default/fragment.glsl">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/3EngineExecutable/src/Tangram3D/Tangram3D.cpp">
+    <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="426">
-          <caret line="96" column="15" selection-start-line="96" selection-start-column="15" selection-end-line="96" selection-end-column="15" />
+        <state relative-caret-position="872">
+          <caret line="50" selection-start-line="50" selection-end-line="51" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/3Engine/src/Shader/ShaderProgram.cpp">
+    <entry file="file://$PROJECT_DIR$/BuildTools/AppImage/cpld.sh">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/BuildTools/AppImage/build.sh">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-350">
-          <caret line="188" column="87" selection-start-line="188" selection-start-column="87" selection-end-line="188" selection-end-column="87" />
-          <folding>
-            <element signature="e#7328#8279#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="62">
+          <caret line="44" column="40" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" />
         </state>
       </provider>
     </entry>
diff --git a/BuildTools/AppImage/build.sh b/BuildTools/AppImage/build.sh
index e99b86f..f40dade 100755
--- a/BuildTools/AppImage/build.sh
+++ b/BuildTools/AppImage/build.sh
@@ -41,6 +41,15 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
+
+echo "Copy 3Engine library dependencies"
+DEPS="\
+/usr/lib/x86_64-linux-gnu/libSDL2.so \
+/usr/lib/x86_64-linux-gnu/libSDL2_image.so \
+/usr/lib/x86_64-linux-gnu/libSDL2_mixer.so \
+/usr/lib/x86_64-linux-gnu/libSDL2_ttf.so"
+cp ${DEPS} ${APPDIR_DEST_PATH}/lib
+
 #CPLP=${SCRIPT_PATH}/cpld.sh
 #
 #echo "Copy 3Engine library dependencies"