diff --git a/.DS_Store b/.DS_Store
index 43c69b6..f295ecd 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
index f54e63f..b18709a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,11 @@ hs_err_pid*
 replay_pid*
 
 ### Xcode ###
+
+## DrivedData
+build/
+DerivedData/
+
 ## User settings
 xcuserdata/
 
diff --git a/Nexacro14/.DS_Store b/Nexacro14/.DS_Store
index 178c352..caf93be 100644
Binary files a/Nexacro14/.DS_Store and b/Nexacro14/.DS_Store differ
diff --git a/Nexacro14/Android/.DS_Store b/Nexacro14/Android/.DS_Store
index 55df294..ba4562a 100644
Binary files a/Nexacro14/Android/.DS_Store and b/Nexacro14/Android/.DS_Store differ
diff --git a/Nexacro17/.DS_Store b/Nexacro17/.DS_Store
index 412a0ee..13ddcc1 100644
Binary files a/Nexacro17/.DS_Store and b/Nexacro17/.DS_Store differ
diff --git a/Nexacro17/Android/.DS_Store b/Nexacro17/Android/.DS_Store
index 048baea..7107957 100644
Binary files a/Nexacro17/Android/.DS_Store and b/Nexacro17/Android/.DS_Store differ
diff --git a/Nexacro17/Android/AndroidX/.DS_Store b/Nexacro17/Android/AndroidX/.DS_Store
index 5c10d5e..0694017 100644
Binary files a/Nexacro17/Android/AndroidX/.DS_Store and b/Nexacro17/Android/AndroidX/.DS_Store differ
diff --git a/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.DS_Store b/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.DS_Store
index 65cb055..ddef20d 100644
Binary files a/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.DS_Store and b/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.DS_Store differ
diff --git a/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.idea/gradle.xml b/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.idea/gradle.xml
index ddd634d..5593d82 100644
--- a/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.idea/gradle.xml
+++ b/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -17,7 +18,6 @@
             <option value="$PROJECT_DIR$/gvr-libs-videowidget" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.idea/misc.xml b/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.idea/misc.xml
index ea25025..8ec9413 100644
--- a/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.idea/misc.xml
+++ b/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
diff --git a/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.idea/modules.xml b/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.idea/modules.xml
deleted file mode 100644
index 57a9122..0000000
--- a/Nexacro17/Android/AndroidX/nexacro17_AndroidX/.idea/modules.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/AndroidXHybrid17.iml" filepath="$PROJECT_DIR$/.idea/modules/AndroidXHybrid17.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/AndroidXHybrid17.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/AndroidXHybrid17.app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/gvr-libs-base/AndroidXHybrid17.gvr-libs-base.iml" filepath="$PROJECT_DIR$/.idea/modules/gvr-libs-base/AndroidXHybrid17.gvr-libs-base.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/gvr-libs-common/AndroidXHybrid17.gvr-libs-common.iml" filepath="$PROJECT_DIR$/.idea/modules/gvr-libs-common/AndroidXHybrid17.gvr-libs-common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/gvr-libs-commonwidget/AndroidXHybrid17.gvr-libs-commonwidget.iml" filepath="$PROJECT_DIR$/.idea/modules/gvr-libs-commonwidget/AndroidXHybrid17.gvr-libs-commonwidget.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/gvr-libs-videowidget/AndroidXHybrid17.gvr-libs-videowidget.iml" filepath="$PROJECT_DIR$/.idea/modules/gvr-libs-videowidget/AndroidXHybrid17.gvr-libs-videowidget.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Nexacro17/Android/Android_Legacy/.DS_Store b/Nexacro17/Android/Android_Legacy/.DS_Store
index fabaf3c..6fec8f2 100644
Binary files a/Nexacro17/Android/Android_Legacy/.DS_Store and b/Nexacro17/Android/Android_Legacy/.DS_Store differ
diff --git a/Nexacro17/Android/Android_Legacy/nexacro17_Android/.DS_Store b/Nexacro17/Android/Android_Legacy/nexacro17_Android/.DS_Store
index c774186..00c8f43 100644
Binary files a/Nexacro17/Android/Android_Legacy/nexacro17_Android/.DS_Store and b/Nexacro17/Android/Android_Legacy/nexacro17_Android/.DS_Store differ
diff --git a/Nexacro17/Android/Android_Legacy/nexacro17_Android/.idea/gradle.xml b/Nexacro17/Android/Android_Legacy/nexacro17_Android/.idea/gradle.xml
index ddd634d..5593d82 100644
--- a/Nexacro17/Android/Android_Legacy/nexacro17_Android/.idea/gradle.xml
+++ b/Nexacro17/Android/Android_Legacy/nexacro17_Android/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -17,7 +18,6 @@
             <option value="$PROJECT_DIR$/gvr-libs-videowidget" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/Nexacro17/Android/Android_Legacy/nexacro17_Android/.idea/misc.xml b/Nexacro17/Android/Android_Legacy/nexacro17_Android/.idea/misc.xml
index ea25025..8ec9413 100644
--- a/Nexacro17/Android/Android_Legacy/nexacro17_Android/.idea/misc.xml
+++ b/Nexacro17/Android/Android_Legacy/nexacro17_Android/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
diff --git a/Nexacro17/Android/Android_Legacy/nexacro17_Android/.idea/modules.xml b/Nexacro17/Android/Android_Legacy/nexacro17_Android/.idea/modules.xml
deleted file mode 100644
index db5351f..0000000
--- a/Nexacro17/Android/Android_Legacy/nexacro17_Android/.idea/modules.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/AndroidHybrid17.iml" filepath="$PROJECT_DIR$/.idea/modules/AndroidHybrid17.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/AndroidHybrid17.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/AndroidHybrid17.app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/gvr-libs-base/AndroidHybrid17.gvr-libs-base.iml" filepath="$PROJECT_DIR$/.idea/modules/gvr-libs-base/AndroidHybrid17.gvr-libs-base.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/gvr-libs-common/AndroidHybrid17.gvr-libs-common.iml" filepath="$PROJECT_DIR$/.idea/modules/gvr-libs-common/AndroidHybrid17.gvr-libs-common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/gvr-libs-commonwidget/AndroidHybrid17.gvr-libs-commonwidget.iml" filepath="$PROJECT_DIR$/.idea/modules/gvr-libs-commonwidget/AndroidHybrid17.gvr-libs-commonwidget.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/gvr-libs-videowidget/AndroidHybrid17.gvr-libs-videowidget.iml" filepath="$PROJECT_DIR$/.idea/modules/gvr-libs-videowidget/AndroidHybrid17.gvr-libs-videowidget.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/NexacroN/.DS_Store b/NexacroN/.DS_Store
index 914c8d0..c4b1606 100644
Binary files a/NexacroN/.DS_Store and b/NexacroN/.DS_Store differ
diff --git a/NexacroN/Android/.DS_Store b/NexacroN/Android/.DS_Store
index 623a4e1..8344f90 100644
Binary files a/NexacroN/Android/.DS_Store and b/NexacroN/Android/.DS_Store differ
diff --git a/NexacroN/Android/nexacroApp/.DS_Store b/NexacroN/Android/nexacroApp/.DS_Store
index 7288d9d..aee1e99 100644
Binary files a/NexacroN/Android/nexacroApp/.DS_Store and b/NexacroN/Android/nexacroApp/.DS_Store differ
diff --git a/NexacroN/iOS/.DS_Store b/NexacroN/iOS/.DS_Store
index d2f4292..333f730 100644
Binary files a/NexacroN/iOS/.DS_Store and b/NexacroN/iOS/.DS_Store differ
diff --git a/NexacroN/iOS/nexacroApp/.DS_Store b/NexacroN/iOS/nexacroApp/.DS_Store
index 5980cdc..82d55fb 100644
Binary files a/NexacroN/iOS/nexacroApp/.DS_Store and b/NexacroN/iOS/nexacroApp/.DS_Store differ
diff --git a/NexacroN/iOS/nexacroApp/nexacroApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/NexacroN/iOS/nexacroApp/nexacroApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..919434a
--- /dev/null
+++ b/NexacroN/iOS/nexacroApp/nexacroApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/NexacroN/iOS/nexacroApp/nexacroApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/NexacroN/iOS/nexacroApp/nexacroApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/NexacroN/iOS/nexacroApp/nexacroApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/NexacroN_V24/.DS_Store b/NexacroN_V24/.DS_Store
index 4e84705..8ee626f 100644
Binary files a/NexacroN_V24/.DS_Store and b/NexacroN_V24/.DS_Store differ