Merge branch 'development' into 'main'

Sprint 3 Closes WES-88, WES-89, WES-113, WES-75, WES-97, WES-80, WES-90, WES-95, WES-99, and WES-76 See merge request wesign/unity-application!67
Sprint 3
2023-03-26 21:23:18 +00:00 · 2023-03-26 21:23:17 +00:00 · 2023-03-12 23:15:56 +01:00 · 2023-03-12 22:12:14 +00:00 · 2023-03-12 22:07:09 +00:00 · 2023-03-12 23:05:30 +01:00
815 changed files with 109274 additions and 38674 deletions
--- a/.gitlab/merge_request_templates/Default.md
+++ b/.gitlab/merge_request_templates/Default.md
@@ -0,0 +1,41 @@
+## Description
+
+_Please provide a brief summary of the changes in this merge request._
+
+_If possible, add a short screengrab or some screenshots of the changes._
+
+## Testing Instructions
+
+_Please provide instructions on how the code reviewers can test your changes:_
+
+1. [Step 1]
+2. [Step 2]
+3. [Step 3]
+4. ...
+
+_Please include any specific information on test data, configurations, or other requirements that are necessary to properly test the changes._
+
+Once you've tested the changes, please confirm that they work as expected and that there are no regressions or unexpected side effects. If any issues are discovered during testing, please include detailed steps to reproduce the issue in the merge request comments. Thank you!
+
+## Related Issues
+
+_Please list any related issues or pull requests that are relevant to this merge request._
+_E.g. WES-XXX-..._
+
+## Known bugs or issues
+
+_Please list any known bugs or issues related to the changes in this merge request._
+
+## Checklist
+
+- [ ] I have filled in this template.
+- [ ] I have tested my changes thoroughly (both in the editor + **build and run (ctrl+B)**!).
+- [ ] I have added appropriate unit tests.
+- [ ] I have updated the user documentation as necessary.
+- [ ] Code reviewed by 2 people.
+
+## Additional Notes
+
+_Please add any additional notes or comments that may be helpful for reviewers to understand your changes._
+
+/assign_reviewer @wesign/unityappreviewers 
--- a/Assets/Accounts/Prefabs/UserCard.prefab
+++ b/Assets/Accounts/Prefabs/UserCard.prefab
@@ -96,7 +96,7 @@ MonoBehaviour:
    m_SelectOnDown: {fileID: 0}
    m_SelectOnLeft: {fileID: 0}
    m_SelectOnRight: {fileID: 0}
-  m_Transition: 0
+  m_Transition: 1
  m_Colors:
    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -284,8 +284,8 @@ MonoBehaviour:
  m_fontMaterials: []
  m_fontColor32:
    serializedVersion: 2
-    rgba: 4294309365
-  m_fontColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    rgba: 4281479730
+  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
--- a/Assets/Accounts/Scenes/ChangeUserScreen.unity
+++ b/Assets/Accounts/Scenes/ChangeUserScreen.unity
@@ -755,6 +755,10 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 906197777}
    m_Modifications:
+    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
+      value: Common/Scenes/StartScreen
+      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_Name
      value: ButtonBack
@@ -789,11 +793,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 100
+      value: 300
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 100
+      value: 120
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -863,7 +867,7 @@ GameObject:
  - component: {fileID: 840332114}
  - component: {fileID: 840332113}
  m_Layer: 5
-  m_Name: ContinueButton
+  m_Name: Button
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -934,8 +938,8 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 2129020786}
-        m_TargetAssemblyTypeName: ChangeUserScreen, AccountsScripts
+      - m_Target: {fileID: 906197780}
+        m_TargetAssemblyTypeName: ChangeUserScreen, Assembly-CSharp
        m_MethodName: IChooseYou
        m_Mode: 1
        m_Arguments:
@@ -995,6 +999,7 @@ GameObject:
  - component: {fileID: 906197777}
  - component: {fileID: 906197779}
  - component: {fileID: 906197778}
+  - component: {fileID: 906197780}
  m_Layer: 5
  m_Name: Panel
  m_TagString: Untagged
@@ -1040,14 +1045,14 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -1065,6 +1070,22 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 906197776}
  m_CullTransparentMesh: 1
+--- !u!114 &906197780
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 906197776}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a7f31ce7a41c294b95cb1f9fbec207f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  userPrefab: {fileID: 7566391564300576383, guid: f5103a1b6ba1b0445a0d049203b9b6b2, type: 3}
+  usersContainer: {fileID: 1438010722}
+  error: {fileID: 1815188481}
+  userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
 --- !u!1 &1143249623
 GameObject:
  m_ObjectHideFlags: 0
@@ -1078,7 +1099,7 @@ GameObject:
  - component: {fileID: 1143249626}
  - component: {fileID: 1143249625}
  m_Layer: 5
-  m_Name: CreateUserButton
+  m_Name: Button (1)
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -1149,8 +1170,8 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 2129020786}
-        m_TargetAssemblyTypeName: ChangeUserScreen, AccountsScripts
+      - m_Target: {fileID: 906197780}
+        m_TargetAssemblyTypeName: ChangeUserScreen, Assembly-CSharp
        m_MethodName: GotoUserCreation
        m_Mode: 1
        m_Arguments:
@@ -1586,10 +1607,10 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
+  m_UiScaleMode: 0
  m_ReferencePixelsPerUnit: 100
  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ReferenceResolution: {x: 800, y: 600}
  m_ScreenMatchMode: 0
  m_MatchWidthOrHeight: 0
  m_PhysicalUnit: 3
@@ -1633,7 +1654,7 @@ RectTransform:
  - {fileID: 906197777}
  - {fileID: 1815188482}
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@@ -1884,50 +1905,3 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2109596086}
  m_CullTransparentMesh: 1
--- !u!1 &2129020785
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2129020787}
-  - component: {fileID: 2129020786}
-  m_Layer: 0
-  m_Name: ChangeUserController
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &2129020786
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2129020785}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3a7f31ce7a41c294b95cb1f9fbec207f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  userPrefab: {fileID: 7566391564300576383, guid: f5103a1b6ba1b0445a0d049203b9b6b2, type: 3}
-  usersContainer: {fileID: 1438010722}
-  error: {fileID: 1815188481}
--- !u!4 &2129020787
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2129020785}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/Accounts/Scenes/UserCreationScreen.unity
+++ b/Assets/Accounts/Scenes/UserCreationScreen.unity
@@ -940,8 +940,8 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 1787496675}
-        m_TargetAssemblyTypeName: UserCreationScreen, AccountsScripts
+      - m_Target: {fileID: 906197780}
+        m_TargetAssemblyTypeName: UserCreationScreen, Assembly-CSharp
        m_MethodName: CreateUser
        m_Mode: 1
        m_Arguments:
@@ -1001,6 +1001,7 @@ GameObject:
  - component: {fileID: 906197777}
  - component: {fileID: 906197779}
  - component: {fileID: 906197778}
+  - component: {fileID: 906197780}
  m_Layer: 5
  m_Name: Panel
  m_TagString: Untagged
@@ -1046,14 +1047,14 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -1071,6 +1072,43 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 906197776}
  m_CullTransparentMesh: 1
+--- !u!114 &906197780
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 906197776}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc3902e35c042b14f83b24498d31d587, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  errorMessage: {fileID: 589847186}
+  inputName: {fileID: 645809401}
+  avatarsContainer: {fileID: 1832217925}
+  avatarPrefab: {fileID: 6263784960026409964, guid: c09ef5423059da444ad7743174e9f077, type: 3}
+  sprites:
+  - {fileID: 21300000, guid: 4654657a2ebea444898fa6eeaefcd18d, type: 3}
+  - {fileID: 21300000, guid: b67b99d98d1ceb1489743bcd78b9ab70, type: 3}
+  - {fileID: 21300000, guid: e4af402f37099cd4195d7d2654519744, type: 3}
+  - {fileID: 21300000, guid: 73f4e028d9efb644aa23538a749667c5, type: 3}
+  - {fileID: 21300000, guid: bc11ff9d6cc35de45ab58f39f13d7142, type: 3}
+  - {fileID: 21300000, guid: 2b01165a5836ab14593d7a5862bd6793, type: 3}
+  - {fileID: 21300000, guid: 1a28fa2c46acbb1408633e4e98061d56, type: 3}
+  - {fileID: 21300000, guid: 8009fc8cfee7ea848a678e056731c02e, type: 3}
+  - {fileID: 21300000, guid: 7272bfa2b3f87564eb961d41c641479d, type: 3}
+  - {fileID: 21300000, guid: 1a4d7d2fe1dc58448b2c0451d2924003, type: 3}
+  - {fileID: 21300000, guid: 439c062e9ba9d0f439dffd41509ceee7, type: 3}
+  - {fileID: 21300000, guid: 8962e03659a079546810c3ad9c8a211c, type: 3}
+  - {fileID: 21300000, guid: 182fb89eba9c64041bef31ca35c4bcd8, type: 3}
+  - {fileID: 21300000, guid: c7006b8cc5cff974b9ff307fe13fdd5e, type: 3}
+  - {fileID: 21300000, guid: 16f645dc2176fa248af566b5295b451a, type: 3}
+  - {fileID: 21300000, guid: d574bf2c96bb5b74080b4cf8ca51312d, type: 3}
+  - {fileID: 21300000, guid: 47a49435e7b8c9a49b162fb4d6f9ceaa, type: 3}
+  - {fileID: 21300000, guid: e3c4feacdb7710349b326280e2163a84, type: 3}
+  users: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+  selectedAvatar: 0
 --- !u!1 &1087307046
 GameObject:
  m_ObjectHideFlags: 0
@@ -1307,10 +1345,10 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
+  m_UiScaleMode: 0
  m_ReferencePixelsPerUnit: 100
  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ReferenceResolution: {x: 800, y: 600}
  m_ScreenMatchMode: 0
  m_MatchWidthOrHeight: 0
  m_PhysicalUnit: 3
@@ -1353,61 +1391,13 @@ RectTransform:
  m_Children:
  - {fileID: 906197777}
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0, y: 0}
--- !u!1 &1787496674
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1787496676}
-  - component: {fileID: 1787496675}
-  m_Layer: 0
-  m_Name: UserCreationController
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1787496675
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1787496674}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fc3902e35c042b14f83b24498d31d587, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  errorMessage: {fileID: 589847186}
-  inputName: {fileID: 645809401}
-  avatarsContainer: {fileID: 1832217925}
-  avatarPrefab: {fileID: 6263784960026409964, guid: c09ef5423059da444ad7743174e9f077, type: 3}
--- !u!4 &1787496676
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1787496674}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1832217924
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Accounts/Scenes/UserProgressScreen.unity
+++ b/Assets/Accounts/Scenes/UserProgressScreen.unity
@@ -487,61 +487,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &400519678
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 400519680}
-  - component: {fileID: 400519679}
-  m_Layer: 0
-  m_Name: UserProgressController
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &400519679
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 400519678}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a59f8e8c48fbd4444a41df01694d13a7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  username: {fileID: 1021209698}
-  avatar: {fileID: 1873954004}
-  playtime: {fileID: 1716832605}
-  highscoreMarker: {fileID: 7141392721760992647, guid: c54186c4d7aafd5459b0097d481b8fbf, type: 3}
-  courseCardPrefab: {fileID: 5101881939626277738, guid: b953de8778612cd449ba1999c4f7b8c4, type: 3}
-  coursesContainer: {fileID: 1487493400}
-  emptyCourses: {fileID: 494202816}
-  minigameCardPrefab: {fileID: 5101881939626277738, guid: af026fa8050694c4f816aa0c615e1992, type: 3}
-  minigamesContainer: {fileID: 67107106}
-  emptyMinigames: {fileID: 505387970}
-  progressGraph: {fileID: 913667425}
--- !u!4 &400519680
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 400519678}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &494202816
 GameObject:
  m_ObjectHideFlags: 0
@@ -903,6 +848,10 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 906197777}
    m_Modifications:
+    - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
+      value: Common/Scenes/StartScreen
+      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_Name
      value: ButtonBack
@@ -937,11 +886,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 100
+      value: 300
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 100
+      value: 120
      objectReference: {fileID: 0}
    - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -1009,6 +958,7 @@ GameObject:
  - component: {fileID: 906197777}
  - component: {fileID: 906197779}
  - component: {fileID: 906197778}
+  - component: {fileID: 906197780}
  m_Layer: 5
  m_Name: Panel
  m_TagString: Untagged
@@ -1055,14 +1005,14 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -1080,6 +1030,30 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 906197776}
  m_CullTransparentMesh: 1
+--- !u!114 &906197780
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 906197776}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a59f8e8c48fbd4444a41df01694d13a7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+  username: {fileID: 1021209698}
+  avatar: {fileID: 1873954004}
+  playtime: {fileID: 1716832605}
+  highscoreMarker: {fileID: 7141392721760992647, guid: c54186c4d7aafd5459b0097d481b8fbf, type: 3}
+  courseCardPrefab: {fileID: 5101881939626277738, guid: b953de8778612cd449ba1999c4f7b8c4, type: 3}
+  coursesContainer: {fileID: 1487493400}
+  emptyCourses: {fileID: 494202816}
+  minigameCardPrefab: {fileID: 5101881939626277738, guid: af026fa8050694c4f816aa0c615e1992, type: 3}
+  minigamesContainer: {fileID: 67107106}
+  emptyMinigames: {fileID: 505387970}
+  progressGraph: {fileID: 913667425}
 --- !u!1 &909961605
 GameObject:
  m_ObjectHideFlags: 0
@@ -2055,10 +2029,10 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
+  m_UiScaleMode: 0
  m_ReferencePixelsPerUnit: 100
  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ReferenceResolution: {x: 800, y: 600}
  m_ScreenMatchMode: 0
  m_MatchWidthOrHeight: 0
  m_PhysicalUnit: 3
@@ -2101,7 +2075,7 @@ RectTransform:
  m_Children:
  - {fileID: 906197777}
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
--- a/Assets/Accounts/ScriptableObjects/UserAvatarList.asset
+++ b/Assets/Accounts/ScriptableObjects/UserAvatarList.asset
@@ -1,42 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 81765ea55baf15d45b01b02187b02429, type: 3}
-  m_Name: UserAvatarList
-  m_EditorClassIdentifier: 
-  avatars:
-  - {fileID: 21300000, guid: 6feaaea4b64633f49b4538bfd4b3755c, type: 3}
-  - {fileID: 21300000, guid: 399cc241fc79bd74db314f146e7fb6b9, type: 3}
-  - {fileID: 21300000, guid: 4654657a2ebea444898fa6eeaefcd18d, type: 3}
-  - {fileID: 21300000, guid: 0cc198f1cde659246a199b30459720b1, type: 3}
-  - {fileID: 21300000, guid: 7f105a09a3d164547925ee1bdfa595ca, type: 3}
-  - {fileID: 21300000, guid: 313c22e5834595645989d609fe9d8853, type: 3}
-  - {fileID: 21300000, guid: e5f3d99cdf5298d4f86d42dd019a6bad, type: 3}
-  - {fileID: 21300000, guid: b67b99d98d1ceb1489743bcd78b9ab70, type: 3}
-  - {fileID: 21300000, guid: e4af402f37099cd4195d7d2654519744, type: 3}
-  - {fileID: 21300000, guid: 73f4e028d9efb644aa23538a749667c5, type: 3}
-  - {fileID: 21300000, guid: 61e56570163833e448037bc353ada0ac, type: 3}
-  - {fileID: 21300000, guid: 8e69dfd19237abb4f98eb11e74153109, type: 3}
-  - {fileID: 21300000, guid: bc11ff9d6cc35de45ab58f39f13d7142, type: 3}
-  - {fileID: 21300000, guid: f989719a5c45c7a4183b2bc12c1c4905, type: 3}
-  - {fileID: 21300000, guid: 1392922567cd59d4fb0beceea3f5917a, type: 3}
-  - {fileID: 21300000, guid: 3c314ae9e10eafb49b57c98c9e779bd8, type: 3}
-  - {fileID: 21300000, guid: 33509e453b5093e43a148a668a961c56, type: 3}
-  - {fileID: 21300000, guid: 39ac3b86729423846be1fbd56b8d92d6, type: 3}
-  - {fileID: 21300000, guid: 1118d67f50622cc4ab02aa23c6dc1fd4, type: 3}
-  - {fileID: 21300000, guid: e519f0f7b00e6834187963a0131cae52, type: 3}
-  - {fileID: 21300000, guid: eefb367ff44256d43a14cde2c3924321, type: 3}
-  - {fileID: 21300000, guid: 83d6525e4efa4954091e08095349f45a, type: 3}
-  - {fileID: 21300000, guid: db31bca6363270441ab54421f55c1263, type: 3}
-  - {fileID: 21300000, guid: 9d5771baa6ea6e041b066135d6798e1c, type: 3}
-  - {fileID: 21300000, guid: 2b01165a5836ab14593d7a5862bd6793, type: 3}
-  - {fileID: 21300000, guid: 8c304fe460423214ea0bb6ebc235ed2d, type: 3}
-  - {fileID: 21300000, guid: b203b4e5f8568ff46b2277ce6d61017a, type: 3}
--- a/Assets/Accounts/ScriptableObjects/UserList.asset
+++ b/Assets/Accounts/ScriptableObjects/UserList.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3f3d6d68c3c3db64e91cf5ec9537ccda, type: 3}
+  m_Name: UserList
+  m_EditorClassIdentifier: 
+  storedUserList:
+    currentUserIndex: 0
+    storedUsers: []
--- a/Assets/Accounts/ScriptableObjects/UserList.asset.meta
+++ b/Assets/Accounts/ScriptableObjects/UserList.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 37d049cc0ec73ba4188bdaf99a92cbe6
+guid: 072bec636a40f7e4e93b0ac624a3bda2
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/Accounts/Scripts/AccountsScripts.asmdef
+++ b/Assets/Accounts/Scripts/AccountsScripts.asmdef
@@ -3,7 +3,6 @@
    "rootNamespace": "",
    "references": [
        "GUID:6055be8ebefd69e48b49212b09b47b2f",
-        "GUID:e83ddf9a537a96b4a804a16bb7872ec1",
        "GUID:7f2d0ee6dd21e1d4eb25b71b7a749d25"
    ],
    "includePlatforms": [],
--- a/Assets/Accounts/Scripts/ChangeUserScreen.cs
+++ b/Assets/Accounts/Scripts/ChangeUserScreen.cs
@@ -22,6 +22,11 @@ public class ChangeUserScreen : MonoBehaviour
    /// </summary>
    public GameObject error;

+    /// <summary>
+    /// Reference to the user list
+    /// </summary>
+    public UserList userList;
+
    /// <summary>
    /// Index of the current selected user in the UserList
    /// </summary>
@@ -37,7 +42,7 @@ public class ChangeUserScreen : MonoBehaviour
    /// </summary>
    void Start()
    {
-        PersistentDataController.GetInstance().Load();
+        userList.Load();
        error.SetActive(false);
        DisplayUsers();
    }
@@ -52,8 +57,8 @@ public class ChangeUserScreen : MonoBehaviour
            Destroy(child.gameObject);
        }

-        List<User> users = UserList.GetUsers();
-        currentUserIndex = UserList.IndexOf(UserList.GetCurrentUser().GetUsername());
+        List<User> users = userList.GetUsers();
+        currentUserIndex = userList.GetCurrentUserIndex();
        for (int i = 0; i < users.Count; i++)
        {
            User user = users[i];
@@ -94,7 +99,8 @@ public class ChangeUserScreen : MonoBehaviour
    /// </summary>
    public void IChooseYou()
    {
-        UserList.ChangeCurrentUser(currentUserIndex);
+        userList.ChangeCurrentUser(currentUserIndex);
+        userList.Save();
        SystemController.GetInstance().BackToPreviousScene();
    }

--- a/Assets/Accounts/Scripts/CourseProgressCard.cs
+++ b/Assets/Accounts/Scripts/CourseProgressCard.cs
@@ -21,7 +21,7 @@ public class CourseProgressCard : MonoBehaviour
    /// <summary>
    /// Reference to the progress so we can display a progress bar
    /// </summary>
-    public PersistentDataController.SavedCourseProgress courseProgress;
+    public Progress courseProgress;

    /// <summary>
    /// Reference to the list of courses so we can query the correct course
@@ -48,11 +48,11 @@ public class CourseProgressCard : MonoBehaviour
    /// </summary>
    void Start()
    {
-        Course course = courseList.GetCourseByIndex(courseProgress.courseIndex);
+        Course course = courseList.GetCourseByIndex(courseProgress.Get<CourseIndex>("courseIndex"));

        thumbnail.sprite = course.thumbnail;
        title.text = course.title;
-        progressBar.value = courseProgress.progress;
+        progressBar.value = courseProgress.Get<float>("courseProgress");
        button.onClick.AddListener(selectActivity);
    }
 }
--- a/Assets/Accounts/Scripts/MinigameProgressCard.cs
+++ b/Assets/Accounts/Scripts/MinigameProgressCard.cs
@@ -22,7 +22,7 @@ public class MinigameProgressCard : MonoBehaviour
    /// <summary>
    /// Reference to the minigame progress
    /// </summary>
-    public PersistentDataController.SavedMinigameProgress minigameProgress;
+    public Progress minigameProgress;

    /// <summary>
    /// Reference to the minigame list
@@ -49,11 +49,11 @@ public class MinigameProgressCard : MonoBehaviour
    /// </summary>
    void Start()
    {
-        Minigame minigame = minigameList.GetMinigameByIndex(minigameProgress.minigameIndex);
+        Minigame minigame = minigameList.GetMinigameByIndex(minigameProgress.Get<MinigameIndex>("minigameIndex"));

        thumbnail.sprite = minigame.thumbnail;
        title.text = minigame.title;
-        List<Score> highscores = minigameProgress.highestScores;
+        List<Score> highscores = minigameProgress.Get<List<Score>>("highestScores");
        int score = highscores.Count > 0 ? highscores[0].scoreValue : 0;
        highscore.text = $"Topscore: {score}";
        button.onClick.AddListener(selectActivity);
--- a/Assets/Accounts/Scripts/Progress.cs
+++ b/Assets/Accounts/Scripts/Progress.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using UnityEngine;
+
+/// <summary>
+/// A class for holding all progress belonging to a user
+/// </summary>
+[Serializable]
+public class Progress
+{
+    /// <summary>
+    /// A helper class for handling the stored progress
+    /// </summary>
+    [Serializable]
+    protected class DataEntry
+    {
+        /// <summary>
+        /// The key, used to reference the data object
+        /// </summary>
+        public string key;
+
+        /// <summary>
+        /// The object, representated as a list of byte (which can be serialized)
+        /// </summary>
+        public List<byte> bytes = new List<byte>();
+
+        public DataEntry(string key, byte[] data)
+        {
+            this.key = key;
+            this.bytes = new List<byte>(data);
+        }
+    }
+
+    /// <summary>
+    /// Entries in the <c>Progress</c> object
+    /// </summary>
+    [SerializeField]
+    private List<DataEntry> entries = new List<DataEntry>();
+
+
+    /// <summary>
+    /// Update the value of a certain key,
+    /// or add a new value if the key was not present
+    /// </summary>
+    /// <typeparam name="T">The type of the data to be added/updated</typeparam>
+    /// <param name="key">The key, used for referencing the data</param>
+    /// <param name="data">The object of type <typeparamref name="T"/></param>
+    /// <returns><c>true</c> if successful, <c>false</c> otherwise</returns>
+    public bool AddOrUpdate<T>(string key, T data)
+    {
+        if (data == null)
+            return false;
+
+        DataEntry entry = entries.Find(x => x.key == key);
+
+        // Hacky serialization stuff
+        BinaryFormatter bf = new BinaryFormatter();
+        using (MemoryStream ms = new MemoryStream())
+        {
+            bf.Serialize(ms, data);
+            if (entry != null)
+            {
+                entry.bytes.Clear();
+                entry.bytes.AddRange(ms.ToArray());
+            }
+            else
+            {
+                entries.Add(new DataEntry(key, ms.ToArray()));
+            }
+            return true;
+        }
+    }
+
+    /// <summary>
+    /// Get the data object of a certain key
+    /// </summary>
+    /// <typeparam name="T">The type of the data object</typeparam>
+    /// <param name="key">The key referencing the data object</param>
+    /// <returns>The data, cast to a type <typeparamref name="T"/></returns>
+    /// <exception cref="KeyNotFoundException"></exception>
+    public T Get<T>(string key)
+    {
+        BinaryFormatter bf = new BinaryFormatter();
+        using (MemoryStream ms = new MemoryStream())
+        {
+            // Find the correct key
+            foreach (DataEntry entry in entries)
+            {
+                if (entry.key == key)
+                {
+                    // Hacky serialization stuff
+                    byte[] data = entry.bytes.ToArray();
+                    ms.Write(data, 0, data.Length);
+                    ms.Seek(0, SeekOrigin.Begin);
+                    return (T)bf.Deserialize(ms);
+                }
+            }
+        }
+        // Raise an exception when key is not found
+        throw new KeyNotFoundException();
+    }
+
+    /// <summary>
+    /// Check whether a key is present
+    /// </summary>
+    /// <param name="key">The key to check</param>
+    /// <returns>true if a item can be found with the specified key</returns>
+    public bool Has(string key)
+    {
+        return entries.Find(x => x.key == key) != null;
+    }
+}
--- a/Assets/Common/Interfaces/ModelIndex.cs.meta
+++ b/Assets/Common/Interfaces/ModelIndex.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6dbd5e1100bc81648b52206df369d0a1
+guid: d887bc641cc7a8f4abf9d4eb34d26923
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Assets/SystemArchitecture/Scripts/SystemController.cs
+++ b/Assets/SystemArchitecture/Scripts/SystemController.cs
--- a/Assets/SystemArchitecture/Scripts/SystemController.cs.meta
+++ b/Assets/SystemArchitecture/Scripts/SystemController.cs.meta
--- a/Assets/Accounts/Scripts/User.cs
+++ b/Assets/Accounts/Scripts/User.cs
@@ -2,45 +2,40 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
-using static PersistentDataController;

 /// <summary>
 /// A class holding all information of a user
 /// </summary>
+[Serializable]
 public class User
 {
    /// <summary>
-    /// Reference to the user stored data record
+    /// User nickname
    /// </summary>
-    private SavedUserData storedUserData;
+    public string username;

    /// <summary>
-    /// Constructor
+    /// The avatar of the user
    /// </summary>
-    /// <param name="data">Reference to the user stored data record</param>
-    public User(SavedUserData data)
-    {
-        this.storedUserData = data;
-    }
+    public Sprite avatar;

    /// <summary>
-    /// Get the username
+    /// The total playtime of the user
    /// </summary>
-    /// <returns></returns>
-    public string GetUsername() { return storedUserData.username; }
+    /// <remarks>TODO: needs to be implemented</remarks>
+    public double playtime;

    /// <summary>
-    /// Get the total playtime
+    /// List of courses a user started/completed
    /// </summary>
-    /// <returns></returns>
-    public double GetPlaytime() { return storedUserData.playtime; }
+    [SerializeField]
+    public List<Progress> courses = new List<Progress>();

    /// <summary>
-    /// Get the avatar
+    /// List of minigames a user played
    /// </summary>
-    /// <returns></returns>
-    public Sprite GetAvatar() { return UserList.AVATARS[storedUserData.avatarIndex]; }
-
+    [SerializeField]
+    public List<Progress> minigames = new List<Progress>();

    /// <summary>
    /// Get a list of all recently started courses
@@ -51,10 +46,10 @@ public class User
    {
        // TODO: return better results (for now only return all courses)
        List<Tuple<CourseIndex, float>> recentCourses = new List<Tuple<CourseIndex, float>>();
-        foreach (var courseProgress in storedUserData.courses)
+        foreach (Progress courseProgress in courses)
        {
-            CourseIndex idx = courseProgress.courseIndex;
-            float progress = courseProgress.progress;
+            CourseIndex idx = courseProgress.Get<CourseIndex>("courseIndex");
+            float progress = courseProgress.Get<float>("courseProgress");
            recentCourses.Add(Tuple.Create<CourseIndex, float>(idx, progress));
        }
        return recentCourses.Take(3).ToList();
@@ -68,67 +63,31 @@ public class User
    public List<Tuple<CourseIndex, float>> GetRecommendedCourses()
    {
        List<Tuple<CourseIndex, float>> recommenedCourses = new List<Tuple<CourseIndex, float>>();
-        if (storedUserData.courses.Count == 0)
+        if (courses.Count == 0)
        {
            recommenedCourses.Add(Tuple.Create<CourseIndex, float>(CourseIndex.FINGERSPELLING, 0.0f));
        }
        else
        {
            // TODO: return better results (for now only return all courses)
-            foreach (var courseProgress in storedUserData.courses)
+            foreach (Progress courseProgress in courses)
            {
-                CourseIndex idx = courseProgress.courseIndex;
-                float progress = courseProgress.progress;
+                CourseIndex idx = courseProgress.Get<CourseIndex>("courseIndex");
+                float progress = courseProgress.Get<float>("courseProgress");
                recommenedCourses.Add(Tuple.Create<CourseIndex, float>(idx, progress));
            }
        }
        return recommenedCourses.Take(3).ToList();
    }

-    /// <summary>
-    /// Get the progress of all courses the user did
-    /// </summary>
-    /// <returns></returns>
-    public List<SavedCourseProgress> GetCourses()
-    {
-        return storedUserData.courses;
-    }
-
    /// <summary>
    /// Get the progress of a certain course
    /// </summary>
    /// <param name="courseIndex">Index of course</param>
    /// <returns><c>Progress</c> belonging to the <c>courseIndex</c>, <c>null</c> if course was not found</returns>
-    public SavedCourseProgress GetCourseProgress(CourseIndex courseIndex)
+    public Progress GetCourseProgress(CourseIndex courseIndex)
    {
-        return storedUserData.courses.Find((p) => p.courseIndex == courseIndex);
-    }
-
-    /// <summary>
-    /// Add new progress of a course
-    /// </summary>
-    /// <param name="progress">SavedCourseProgress data record</param>
-    public void AddCourseProgress(SavedCourseProgress progress)
-    {
-        storedUserData.courses.Add(progress);
-    }
-
-    /// <summary>
-    /// Reset progress of a course
-    /// </summary>
-    /// <param name="courseIndex">Index of course</param>
-    public void ResetCourseProgress(CourseIndex courseIndex)
-    {
-        storedUserData.courses.RemoveAll((p) => p.courseIndex == courseIndex);
-    }
-
-    /// <summary>
-    /// Get the progress of all minigames the user did
-    /// </summary>
-    /// <returns></returns>
-    public List<SavedMinigameProgress> GetMinigames()
-    {
-        return storedUserData.minigames;
+        return courses.Find((p) => p.Get<CourseIndex>("courseIndex") == courseIndex);
    }

    /// <summary>
@@ -136,26 +95,8 @@ public class User
    /// </summary>
    /// <param name="minigameIndex">Index of the minigame</param>
    /// <returns><c>Progress</c> belonging to the <c>minigameIndex</c>, <c>null</c> if minigame was not found</returns>
-    public SavedMinigameProgress GetMinigameProgress(MinigameIndex minigameIndex)
+    public Progress GetMinigameProgress(MinigameIndex minigameIndex)
    {
-        return storedUserData.minigames.Find((p) => p.minigameIndex == minigameIndex);
-    }
-
-    /// <summary>
-    /// Add new progress of a minigame
-    /// </summary>
-    /// <param name="progress">SavedMinigameProgress data record</param>
-    public void AddMinigameProgress(SavedMinigameProgress progress)
-    {
-        storedUserData.minigames.Add(progress);
-    }
-
-    /// <summary>
-    /// Reset progress of a minigame
-    /// </summary>
-    /// <param name="minigameIndex">Index of the minigame</param>
-    public void ResetMinigameProgress(MinigameIndex minigameIndex)
-    {
-        storedUserData.minigames.RemoveAll((p) => p.minigameIndex == minigameIndex);
+        return minigames.Find((p) => p.Get<MinigameIndex>("minigameIndex") == minigameIndex);
    }
 }
--- a/Assets/Accounts/Scripts/UserAvatarList.cs
+++ b/Assets/Accounts/Scripts/UserAvatarList.cs
@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// Container to hold a reference to all possible user avatar sprites
-/// </summary>
-[CreateAssetMenu(menuName = "Create new Scriptable/User Avatar List")]
-public class UserAvatarList : ScriptableObject
-{
-    /// <summary>
-    /// List of avatar sprites
-    /// </summary>
-    public List<Sprite> avatars = new List<Sprite>();
-
-    public void Awake()
-    {
-        UserList.AVATARS = avatars;
-    }
-}
--- a/Assets/Accounts/Scripts/UserCard.cs
+++ b/Assets/Accounts/Scripts/UserCard.cs
@@ -8,6 +8,11 @@ using UnityEngine.UI;
 /// </summary>
 public class UserCard : MonoBehaviour
 {
+    /// <summary>
+    /// Reference to the userlist
+    /// </summary>
+    public UserList userList;
+
    /// <summary>
    /// User to upload info into this card
    /// </summary>
@@ -48,8 +53,8 @@ public class UserCard : MonoBehaviour
    /// </summary>
    void Start()
    {
-        avatar.sprite = user.GetAvatar();
-        username.text = user.GetUsername();
+        avatar.sprite = user.avatar;
+        username.text = user.username;
        button.onClick.AddListener(selectUser);
    }

@@ -58,9 +63,10 @@ public class UserCard : MonoBehaviour
    /// </summary>
    public void DeleteUser()
    {
-        if (UserList.DeleteUser(user.GetUsername()))
+        if (userList.DeleteUser(user))
        {
            // User is removed, update and save
+            userList.Save();
            updateUserCardContainer();
        }
        else
--- a/Assets/Accounts/Scripts/UserCreationScreen.cs
+++ b/Assets/Accounts/Scripts/UserCreationScreen.cs
@@ -34,9 +34,20 @@ public class UserCreationScreen : MonoBehaviour
    /// </summary>
    public GameObject avatarPrefab;

+    /// <summary>
+    /// List of all sprites that are supported as avatars
+    /// </summary>
+    public List<Sprite> sprites = new List<Sprite>();
+
+    /// <summary>
+    /// Reference to the UserList ScriptableObject
+    /// </summary>
+    public UserList users;
+
    /// <summary>
    /// Current selected avatar
    /// </summary>
+    [SerializeField]
    private int selectedAvatar = 0;

    /// <summary>
@@ -52,7 +63,7 @@ public class UserCreationScreen : MonoBehaviour
    {
        errorMessage.SetActive(false);

-        for (int i = 0; i < UserList.AVATARS.Count; i++)
+        for (int i = 0; i < sprites.Count; i++)
        {
            // Create instance of prefab
            GameObject instance = GameObject.Instantiate(avatarPrefab, avatarsContainer);
@@ -68,7 +79,7 @@ public class UserCreationScreen : MonoBehaviour
            // Set background color
            background.color = selectedAvatar == i ? Color.blue : Color.gray;
            // Find correct component for setting the sprite
-            instance.transform.Find("Image").GetComponent<Image>().sprite = UserList.AVATARS[i];
+            instance.transform.Find("Image").GetComponent<Image>().sprite = sprites[i];
        }
    }

@@ -102,10 +113,10 @@ public class UserCreationScreen : MonoBehaviour
        string username = inputName.text;
        if (IsValidUsername(username))
        {
-            if (UserList.GetUserByUsername(username) == null)
+            if (users.GetUserByUsername(username) == null)
            {
                // Create a new entry in the UserList ScriptableObject
-                UserList.AddUser(username, UserList.AVATARS[selectedAvatar]);
+                users.ChangeCurrentUser(users.CreateAndAddNewUser(username, sprites[selectedAvatar]));
                SystemController.GetInstance().BackToPreviousScene();
            }
            // Warn user that username already exists
--- a/Assets/Accounts/Scripts/UserList.cs
+++ b/Assets/Accounts/Scripts/UserList.cs
@@ -1,33 +1,87 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using UnityEngine;

 /// <summary>
 /// Keep track of all users
 /// </summary>
-public static class UserList
+[CreateAssetMenu(menuName = "Create new Scriptable/UserList")]
+public class UserList : ScriptableObject
 {
    /// <summary>
-    /// List of possible avatar sprites
+    /// Helper class to enable serialization of the UserList class
+    /// (<c>ScriptableObject</c>s cannot be serialized)
    /// </summary>
-    public static List<Sprite> AVATARS = new List<Sprite>();
+    [Serializable]
+    public class StoredUserList
+    {
+        /// <summary>
+        /// The index of the current/last logged in user in the <c>storedUsers</c> list
+        /// </summary>
+        public int currentUserIndex = -1;
+
+        /// <summary>
+        /// A list containing all users (which can be serialized)
+        /// </summary>
+        public List<User> storedUsers = new List<User>();
+    }
+
+    /// <summary>
+    /// Reference to the serializable version of <c>UserList</c>
+    /// </summary>
+    [SerializeField]
+    private StoredUserList storedUserList = new StoredUserList();
+
+    /// <summary>
+    /// Path of the <c>.json</c>-file to store all serialized data
+    /// </summary>
+    public static string PATH = null;
+
+    /// <summary>
+    /// OnEnable will make sure the <c>PATH</c>-variable is correctly initialized
+    /// </summary>
+    void OnEnable()
+    {
+        // The PATH variable can be set by the testing framework,
+        // so we don't overwrite the actual userlist with test data
+        if (PATH == null)
+        {
+            PATH = $"{Application.persistentDataPath}/users.json";
+            Load();
+        }
+    }
+
+    /// <summary>
+    /// Create a new user
+    /// </summary>
+    /// <param name="name">The username of the new user</param>
+    /// <param name="avatar">Reference to the user avatar</param>
+    /// <returns>A newly created user</returns>
+    public User CreateNewUser(string name, Sprite avatar)
+    {
+        User user = new User();
+        user.username = name;
+        user.avatar = avatar;
+        return user;
+    }

    /// <summary>
    /// Create a new user and save (add to list)
    /// </summary>
-    /// <param name="username">The username of the new user</param>
+    /// <param name="name">The username of the new user</param>
    /// <param name="avatar">Reference to the user avatar</param>
    /// <returns>A newly created user</returns>
-    public static User AddUser(string username, Sprite avatar)
+    public User CreateAndAddNewUser(string name, Sprite avatar)
    {
-        PersistentDataController pdc = PersistentDataController.GetInstance();
-        PersistentDataController.SavedUserData data = new PersistentDataController.SavedUserData();
-        data.username = username;
-        data.playtime = 0.0;
-        data.avatarIndex = AVATARS.IndexOf(avatar);
-
-        pdc.AddUser(data);
-        return new User(data);
+        User user = CreateNewUser(name, avatar);
+        storedUserList.storedUsers.Add(user);
+        if (storedUserList.storedUsers.Count == 1)
+        {
+            storedUserList.currentUserIndex = 0;
+        }
+        Save();
+        return user;
    }

    /// <summary>
@@ -35,61 +89,43 @@ public static class UserList
    /// </summary>
    /// <param name="username">The username of the user</param>
    /// <returns><c>User</c>-object if a user with such username was found, <c>null</c> otherwise</returns>
-    public static User GetUserByUsername(string username)
+    public User GetUserByUsername(string username)
    {
-        foreach (User user in GetUsers())
-            if (user.GetUsername() == username) return user;
+        foreach (User user in storedUserList.storedUsers)
+            if (user.username == username) return user;

        return null;
    }

-    /// <summary>
-    /// Get a user by index
-    /// </summary>
-    /// <param name="index">The index of the user</param>
-    /// <returns>User object</returns>
-    /// <exception cref="IndexOutOfRangeException"></exception>
-    public static User GetUserByIndex(int index)
-    {
-        List<User> users = GetUsers();
-        if (index < 0 || users.Count <= index)
-            throw new IndexOutOfRangeException();
-
-        return users[index];
-    }
-
    /// <summary>
    /// Get a list of all users currently stored
    /// </summary>
    /// <returns>A list of all users</returns>
-    public static List<User> GetUsers()
+    public List<User> GetUsers()
    {
-        PersistentDataController pdc = PersistentDataController.GetInstance();
-        return pdc.GetUsers().ConvertAll((d) => new User(d));
+        return storedUserList.storedUsers;
    }

    /// <summary>
    /// Get the current logged in user
    /// </summary>
    /// <returns>The current logged in user</returns>
-    public static User GetCurrentUser()
+    public User GetCurrentUser()
    {
-        List<User> users = GetUsers();
-        if (users.Count == 0)
+        if (storedUserList.storedUsers.Count == 0)
+        {
            return null;
-        return users[PersistentDataController.GetInstance().GetCurrentUser()];
+        }
+        return storedUserList.storedUsers[storedUserList.currentUserIndex];
    }

    /// <summary>
-    /// Get the index in the userlist of a user
+    /// Get the index in the userlist of the current playing user
    /// </summary>
    /// <returns></returns>
-    public static int IndexOf(string username)
+    public int GetCurrentUserIndex()
    {
-        int idx = GetUsers().FindIndex((e) => e.GetUsername() == username);
-        if (idx < 0)
-            throw new KeyNotFoundException();
-        return idx;
+        return storedUserList.currentUserIndex;
    }

    /// <summary>
@@ -97,66 +133,89 @@ public static class UserList
    /// </summary>
    /// <param name="index">Index of the user in the userlist</param>
    /// <exception cref="IndexOutOfRangeException"></exception>
-    public static void ChangeCurrentUser(int index)
+    public void ChangeCurrentUser(int index)
    {
-        if (index < 0 || GetUsers().Count <= index)
+        if (0 <= index && index < storedUserList.storedUsers.Count)
+        {
+            storedUserList.currentUserIndex = index;
+        }
+        else
+        {
            throw new IndexOutOfRangeException();
-
-        PersistentDataController.GetInstance().SetCurrentUser(index, true);
+        }
    }

-
    /// <summary>
    /// Change the current user
    /// </summary>
-    /// <param name="index">Username of the user</param>
+    /// <param name="user">Reference to the user in the userlist</param>
    /// <exception cref="KeyNotFoundException"></exception>
-    public static void ChangeCurrentUser(string username)
+    public void ChangeCurrentUser(User user)
    {
-        int index = GetUsers().FindIndex((e) => e.GetUsername() == username);
-        try { ChangeCurrentUser(index); }
-        catch (IndexOutOfRangeException) { throw new KeyNotFoundException(); }
+        int idx = storedUserList.storedUsers.IndexOf(user);
+        if (idx < 0)
+        {
+            throw new KeyNotFoundException();
+        }
+        storedUserList.currentUserIndex = idx;
    }

    /// <summary>
-    /// I am inevitable, *snap*
+    /// Remove the user
    /// </summary>
    /// <param name="index">The index of the user in the userlist</param>
-    /// <returns>true if the user was successful removed, false otherwise</returns>
-    /// <exception cref="IndexOutOfRangeException"></exception>
-    public static bool DeleteUser(int index)
+    /// <returns>true if user was successful removed, false otherwise</returns
+    public bool DeleteUser(int index)
    {
-        List<User> users = GetUsers();
-        if (index < 0 || users.Count <= index)
-            throw new IndexOutOfRangeException();
-
-        if (1 < users.Count)
+        if (0 <= index && index < storedUserList.storedUsers.Count)
        {
-            PersistentDataController.GetInstance().DeleteUser(index);
-            return true;
+            return DeleteUser(storedUserList.storedUsers[index]);
        }
        return false;
    }

    /// <summary>
-    /// Delete a user from the userliset
+    /// I am inevitable, *snap*
    /// </summary>
-    /// <param name="username">Username of the user</param>
+    /// <param name="user">Reference to the user to be removed</param>
    /// <returns>true if the user was successful removed, false otherwise</returns>
-    /// <exception cref="KeyNotFoundException"></exception>
-    public static bool DeleteUser(string username)
+    public bool DeleteUser(User user)
    {
-        int index = GetUsers().FindIndex((e) => e.GetUsername() == username);
+        if (1 < storedUserList.storedUsers.Count)
+        {
+            if (storedUserList.currentUserIndex == storedUserList.storedUsers.Count - 1)
+            {
+                storedUserList.currentUserIndex--;
+            }

-        try { return DeleteUser(index); }
-        catch (IndexOutOfRangeException) { throw new KeyNotFoundException(); }
+            return storedUserList.storedUsers.Remove(user);
+        }
+        return false;
    }

    /// <summary>
-    /// Save the current UserList
+    /// Save the users
    /// </summary>
-    public static void Save()
+    public void Save()
    {
-        PersistentDataController.GetInstance().Save();
+        string json = JsonUtility.ToJson(storedUserList);
+        File.CreateText(PATH).Close();
+        File.WriteAllText(PATH, json);
+    }
+
+    /// <summary>
+    /// Override the current content of the userlist by what is stored on disk
+    /// </summary>
+    public void Load()
+    {
+        storedUserList.storedUsers.Clear();
+        storedUserList.currentUserIndex = -1;
+
+        if (!File.Exists(PATH))
+        {
+            Save();
+        }
+        string text = File.ReadAllText(PATH);
+        storedUserList = JsonUtility.FromJson<StoredUserList>(text);
    }
 }
--- a/Assets/Accounts/Scripts/UserProgressScreen.cs
+++ b/Assets/Accounts/Scripts/UserProgressScreen.cs
@@ -10,6 +10,11 @@ using UnityEngine.UI;
 /// </summary>
 public class UserProgressScreen : MonoBehaviour
 {
+    /// <summary>
+    /// Reference to the userlist
+    /// </summary>
+    public UserList userList;
+
    /// <summary>
    /// Reference to the current user
    /// </summary>
@@ -107,12 +112,12 @@ public class UserProgressScreen : MonoBehaviour
    void Start()
    {
        // Assign the current user
-        PersistentDataController.GetInstance().Load();
-        user = UserList.GetCurrentUser();
+        userList.Load();
+        user = userList.GetCurrentUser();

        // Set correct displayed items
-        username.text = user.GetUsername();
-        avatar.sprite = user.GetAvatar();
+        username.text = user.username;
+        avatar.sprite = user.avatar;
        // TODO: implement total playtime
        //playtime.text = $"Totale speeltijd: {user.playtime.ToString("0.00")}";

@@ -121,10 +126,9 @@ public class UserProgressScreen : MonoBehaviour

        int i = 0;
        // Display courses
-        var courses = user.GetCourses();
-        coursesContainer.SetActive(courses.Count > 0);
-        emptyCourses.SetActive(courses.Count <= 0);
-        foreach (var courseProgress in courses)
+        coursesContainer.SetActive(user.courses.Count > 0);
+        emptyCourses.SetActive(user.courses.Count <= 0);
+        foreach (Progress courseProgress in user.courses)
        {
            // Create instance of prefab
            GameObject instance = GameObject.Instantiate(courseCardPrefab, coursesContainer.transform.Find("Viewport").Find("Content").transform);
@@ -138,14 +142,13 @@ public class UserProgressScreen : MonoBehaviour
            // Store reference to background so we can apply fancy coloring
            Image background = instance.GetComponent<Image>();
            background.color = Color.gray;
-            activities.Add(Tuple.Create(background, (int)courseProgress.courseIndex));
+            activities.Add(Tuple.Create(background, (int)courseProgress.Get<CourseIndex>("courseIndex")));
        }

        // Display minigames
-        var minigames = user.GetMinigames();
-        minigamesContainer.SetActive(minigames.Count > 0);
-        emptyMinigames.SetActive(minigames.Count <= 0);
-        foreach (var minigameProgress in minigames)
+        minigamesContainer.SetActive(user.minigames.Count > 0);
+        emptyMinigames.SetActive(user.minigames.Count <= 0);
+        foreach (Progress minigameProgress in user.minigames)
        {
            // Create instance of prefab
            GameObject instance = GameObject.Instantiate(minigameCardPrefab, minigamesContainer.transform.Find("Viewport").Find("Content").transform);
@@ -159,7 +162,7 @@ public class UserProgressScreen : MonoBehaviour
            // Store reference to background so we can apply fancy coloring
            Image background = instance.GetComponent<Image>();
            background.color = Color.gray;
-            activities.Add(Tuple.Create(background, (int)minigameProgress.minigameIndex));
+            activities.Add(Tuple.Create(background, (int)minigameProgress.Get<MinigameIndex>("minigameIndex")));
        }
    }

@@ -180,7 +183,7 @@ public class UserProgressScreen : MonoBehaviour

        selectedActivity = newActivity;
        activities[selectedActivity].Item1.color = Color.blue;
-        if (selectedActivity < user.GetCourses().Count)
+        if (selectedActivity < user.courses.Count)
        {
            // TODO: create a better graph
            //DisplayCourseGraph((CourseIndex)activities[selectedActivity].Item2);
@@ -208,9 +211,9 @@ public class UserProgressScreen : MonoBehaviour
    /// <param name="minigameIndex">Index of the minigame</param>
    private void DisplayMinigameGraph(MinigameIndex minigameIndex)
    {
-        var progress = user.GetMinigameProgress(minigameIndex);
-        List<Score> latestScores = progress.latestScores;
-        List<Score> highestScores = progress.highestScores;
+        Progress progress = user.GetMinigameProgress(minigameIndex);
+        List<Score> latestScores = progress.Get<List<Score>>("latestScores");
+        List<Score> highestScores = progress.Get<List<Score>>("highestScores");
        if (0 < highestScores.Count)
        {
            PlotGraph(latestScores.ConvertAll<double>((s) => (double)s.scoreValue), highestScores[0].scoreValue);
--- a/Assets/Accounts/Tests/AccountsTests.asmdef
+++ b/Assets/Accounts/Tests/AccountsTests.asmdef
@@ -5,8 +5,7 @@
        "UnityEngine.TestRunner",
        "UnityEditor.TestRunner",
        "AccountsScripts",
-        "InterfacesScripts",
-        "SystemArchitecture"
+        "InterfacesScripts"
    ],
    "includePlatforms": [
        "Editor"
--- a/Assets/Accounts/Tests/ProgressTest.cs
+++ b/Assets/Accounts/Tests/ProgressTest.cs
@@ -0,0 +1,213 @@
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using UnityEngine;
+
+/// <summary>
+/// Test the Progress class
+/// </summary>
+[TestFixture]
+public class ProgressTest
+{
+    /// <summary>
+    /// Reference to the progress object to be tested
+    /// </summary>
+    private Progress progress;
+
+    /// <summary>
+    /// A dummy serializable struct to perform test operations on
+    /// </summary>
+    [Serializable]
+    private struct SerializableStruct
+    {
+        public int r, g, b;
+        public float x, y, z;
+    }
+
+    /// <summary>
+    /// A dummy non-serializable struct to perform test operations on
+    /// </summary>
+    private struct NonSerializableStruct
+    {
+        public int r, g, b;
+        public float x, y, z;
+    }
+
+    /// <summary>
+    /// Setup the tests
+    /// </summary>
+    [SetUp]
+    public void Setup_Progress()
+    {
+        progress = new Progress();
+    }
+
+    /// <summary>
+    /// Test for creation of a new progress
+    /// </summary>
+    [Test]
+    public void Test_New_Progress()
+    {
+        Assert.IsNotNull(progress);
+    }
+
+    /// <summary>
+    /// Test whether invalid data will not be added
+    /// </summary>
+    [Test]
+    public void Test_Progress_Add_InvalidData()
+    {
+        Assert.IsFalse(progress.AddOrUpdate<GameObject>("key", null));
+    }
+
+    /// <summary>
+    /// Test whether a duplicated key will be added
+    /// </summary>
+    [Test]
+    public void Test_Progress_Add_DuplicateKey()
+    {
+        progress.AddOrUpdate<int>("key 1", 0);
+        Assert.IsTrue(progress.AddOrUpdate<int>("key 1", 1));
+    }
+
+    /// <summary>
+    /// Test whether a <c>int</c> value can be added
+    /// </summary>
+    [Test]
+    public void Test_Progress_Add_Int()
+    {
+        Assert.IsTrue(progress.AddOrUpdate<int>("key", 1));
+    }
+
+    /// <summary>
+    /// Test whether a <c>double</c> value can be added
+    /// </summary>
+    [Test]
+    public void Test_Progress_Add_Double()
+    {
+        Assert.IsTrue(progress.AddOrUpdate<double>("key", 1.0));
+    }
+
+    /// <summary>
+    /// Test whether a <c>string</c> value can be added
+    /// </summary>
+    [Test]
+    public void Test_Progress_Add_String()
+    {
+        Assert.IsTrue(progress.AddOrUpdate<string>("key", "Hello World!"));
+    }
+
+    /// <summary>
+    /// Test whether a serializable struct can be added
+    /// </summary>
+    [Test]
+    public void Test_Progress_Add_SerializableStruct()
+    {
+        Assert.IsTrue(progress.AddOrUpdate<SerializableStruct>("key", new SerializableStruct()));
+    }
+
+    /// <summary>
+    /// Test whether a non-serializable struct will throw an error
+    /// </summary>
+    [Test]
+    public void Test_Progress_Add_NonSerializableStruct()
+    {
+        NonSerializableStruct nss = new NonSerializableStruct();
+        Assert.Throws<SerializationException>(delegate { progress.AddOrUpdate<NonSerializableStruct>("key", nss); });
+    }
+
+    /// <summary>
+    /// Test whether a key is present
+    /// </summary>
+    [Test]
+    public void Test_Progress_Has_ValidKey()
+    {
+        progress.AddOrUpdate<int>("key", 1);
+        Assert.IsTrue(progress.Has("key"));
+    }
+
+    /// <summary>
+    /// Test whether a key is not present
+    /// </summary>
+    [Test]
+    public void Test_Progress_Has_InvalidKey()
+    {
+        Assert.IsFalse(progress.Has("non-existing key"));
+    }
+
+    /// <summary>
+    /// Test whether an invalid key will throw an error
+    /// </summary>
+    [Test]
+    public void Test_Progress_Get_InvalidKey()
+    {
+        Assert.Throws<KeyNotFoundException>(delegate { progress.Get<int>("non-existing key"); });
+    }
+
+    /// <summary>
+    /// Test whether an invalid type will throw an error
+    /// </summary>
+    [Test]
+    public void Test_Progress_Get_InvalidType()
+    {
+        progress.AddOrUpdate<int>("key", 123456789);
+        Assert.Throws<InvalidCastException>(delegate { progress.Get<double>("key"); });
+    }
+
+    /// <summary>
+    /// Test whether a value is correctly updated
+    /// </summary>
+    [Test]
+    public void Test_Progress_Update()
+    {
+        progress.AddOrUpdate<int>("key", 1);
+        Assert.AreEqual(progress.Get<int>("key"), 1);
+        progress.AddOrUpdate<int>("key", 2);
+        Assert.AreEqual(progress.Get<int>("key"), 2);
+    }
+
+    /// <summary>
+    /// Test whether a <c>int</c> value can be read
+    /// </summary>
+    [Test]
+    public void Test_Progress_Get_Int()
+    {
+        progress.AddOrUpdate<int>("key", 1);
+        Assert.AreEqual(progress.Get<int>("key"), 1);
+    }
+
+    /// <summary>
+    /// Test whether a <c>double</c> value can be read
+    /// </summary>
+    [Test]
+    public void Test_Progress_Get_Double()
+    {
+        progress.AddOrUpdate<double>("key", 1.0);
+        Assert.AreEqual(progress.Get<double>("key"), 1.0);
+    }
+
+    /// <summary>
+    /// Test whether a <c>string</c> value can be read
+    /// </summary>
+    [Test]
+    public void Test_Progress_Get_String()
+    {
+        progress.AddOrUpdate<string>("key", "Hello World!");
+        Assert.AreEqual(progress.Get<string>("key"), "Hello World!");
+    }
+
+    /// <summary>
+    /// Test whether a serializable struct can be read
+    /// </summary>
+    [Test]
+    public void Test_Progress_Get_Struct()
+    {
+        int R = 1, G = 10, B = 100;
+        float X = 0.1f, Y = 0.01f, Z = 0.001f;
+        SerializableStruct data = new SerializableStruct { r = R, g = G, b = B, x = X, y = Y, z = Z };
+        progress.AddOrUpdate<SerializableStruct>("key", data);
+        SerializableStruct result = progress.Get<SerializableStruct>("key");
+        Assert.AreEqual(result, data);
+    }
+}
--- a/Assets/Accounts/Tests/ProgressTest.cs.meta
+++ b/Assets/Accounts/Tests/ProgressTest.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 78a3f61c93a08c04496c49ffd10b9021
+guid: 30234b937b9c84460ad4846ae1941484
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Assets/Accounts/Tests/UserListTest.cs
+++ b/Assets/Accounts/Tests/UserListTest.cs
@@ -1,8 +1,8 @@
 using NUnit.Framework;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using UnityEditor;
 using UnityEngine;

 /// <summary>
@@ -12,10 +12,20 @@ using UnityEngine;
 public class UserListTest
 {
    /// <summary>
-    /// Create a new path so the existing .json file will not be overwritten
+    /// Create a new path so the existing users.json file will not be overwritten
    /// </summary>
    private static string PATH = $"{Application.persistentDataPath}/unit_test_users.json";

+    /// <summary>
+    /// NUnit test magic (for skipping the setup)
+    /// </summary>
+    public const string SKIP_SETUP = "SKIP_SETUP";
+
+    /// <summary>
+    /// Reference to the userlist to be tested
+    /// </summary>
+    private UserList userList;
+
    /// <summary>
    /// Helper variable for quick user creation
    /// </summary>
@@ -24,7 +34,11 @@ public class UserListTest
    /// <summary>
    /// Helper variable for quick user creation
    /// </summary>
-    private Sprite avatar = null;
+    private Sprite avatar = Sprite.Create(
+        Texture2D.blackTexture,
+        new Rect(0, 0, Texture2D.blackTexture.width, Texture2D.blackTexture.height),
+        new Vector2(0.5f, 0.5f)
+    );

    /// <summary>
    /// Setup the tests
@@ -32,14 +46,27 @@ public class UserListTest
    [SetUp]
    public void Setup_UserList()
    {
-        PersistentDataController.PATH = UserListTest.PATH;
+        // Check whether the current test needs to skip the setup
+        ArrayList cat = TestContext.CurrentContext.Test.Properties["_CATEGORIES"] as ArrayList;
+        bool skip = cat != null && cat.Contains(SKIP_SETUP);
+        if (!skip)
+        {
+            // The actual setup code
+            UserList.PATH = UserListTest.PATH;
+            userList = ScriptableObject.CreateInstance<UserList>();
+        }
+    }

-        if (File.Exists(PATH))
-            File.Delete(PATH);
-
-        PersistentDataController.GetInstance().Load();
-        AssetDatabase.LoadAssetAtPath<UserAvatarList>("Assets/Accounts/ScriptableObjects/UserAvatarList.asset").Awake();
-        avatar = UserList.AVATARS[0];
+    /// <summary>
+    /// Test whether the UserList.PATH is correctly set
+    /// </summary>
+    [Test]
+    [Category(SKIP_SETUP)]
+    public void Test_UserList_OnEnable()
+    {
+        UserList.PATH = null;
+        userList = ScriptableObject.CreateInstance<UserList>();
+        Assert.AreEqual($"{Application.persistentDataPath}/users.json", UserList.PATH);
    }

    /// <summary>
@@ -48,22 +75,36 @@ public class UserListTest
    [Test]
    public void Test_New_UserList()
    {
-        Assert.Zero(UserList.GetUsers().Count);
+        Assert.IsNotNull(userList);
+        Assert.Zero(userList.GetUsers().Count);
    }

    /// <summary>
    /// Test for creation of new user (without adding the user to the list)
    /// </summary>
    [Test]
-    public void Test_UserList_AddUser()
+    public void Test_UserList_CreateNewUser()
    {
-        Assert.Zero(UserList.GetUsers().Count);
-        User user = UserList.AddUser(username, avatar);
+        User user = userList.CreateNewUser(username, avatar);

        Assert.IsNotNull(user);
-        Assert.AreEqual(1, UserList.GetUsers().Count);
-        Assert.AreEqual(username, user.GetUsername());
-        Assert.AreEqual(avatar, user.GetAvatar());
+        Assert.Zero(userList.GetUsers().Count);
+        Assert.AreEqual(username, user.username);
+        Assert.AreEqual(avatar, user.avatar);
+    }
+
+    /// <summary>
+    /// Test for creating a new user and adding the user to the list
+    /// </summary>
+    public void Test_UserList_CreateAndAddNewUser()
+    {
+        Assert.AreEqual(-1, userList.GetCurrentUserIndex());
+        User user = userList.CreateAndAddNewUser(username, avatar);
+
+        Assert.IsNotNull(user);
+        Assert.AreEqual(1, userList.GetUsers().Count);
+        Assert.AreEqual(user, userList.GetUsers()[0]);
+        Assert.Zero(userList.GetCurrentUserIndex());
    }

    /// <summary>
@@ -72,9 +113,9 @@ public class UserListTest
    [Test]
    public void Test_UserList_GetUserByUsername_Valid()
    {
-        User u = UserList.AddUser(username, avatar);
-        User v = UserList.GetUserByUsername(username);
-        Assert.AreEqual(u.GetUsername(), v.GetUsername());
+        User u = userList.CreateAndAddNewUser(username, avatar);
+        User v = userList.GetUserByUsername(username);
+        Assert.AreEqual(u, v);
    }

    /// <summary>
@@ -83,70 +124,32 @@ public class UserListTest
    [Test]
    public void Test_UserList_GetUserByUsername_Null()
    {
-        User user = UserList.GetUserByUsername("not-a-user");
+        User user = userList.GetUserByUsername("not-a-user");
        Assert.IsNull(user);
    }

-
-
-    /// <summary>
-    /// Test whether an existing user can be found by its username
-    /// </summary>
-    [Test]
-    public void Test_UserList_GetUserByIndex_Valid()
-    {
-        User u = UserList.AddUser(username, avatar);
-        User v = UserList.GetUserByIndex(0);
-        Assert.AreEqual(u.GetUsername(), v.GetUsername());
-    }
-
-    /// <summary>
-    /// Test whether a non-existing user can not be found
-    /// </summary>
-    [Test]
-    public void Test_UserList_GetUserByIndex_Exception()
-    {
-        Assert.Throws<IndexOutOfRangeException>(delegate { UserList.GetUserByIndex(0); });
-    }
-
-    /// <summary>
-    /// Test whether a userlist is correctly returned
-    /// </summary>
-    [Test]
-    public void Test_UserList_GetUsers()
-    {
-        List<User> u = new List<User>();
-        for (int i = 0; i < 5; i++)
-            u.Add(UserList.AddUser($"{username}_{i}", avatar));
-
-        List<User> v = UserList.GetUsers();
-        Assert.AreEqual(v.Count, u.Count);
-        for (int i = 0; i < 5; i++)
-            Assert.AreEqual(u[i].GetUsername(), v[i].GetUsername());
-    }
-
    /// <summary>
    /// Test whether the correct current user is returned
    /// </summary>
    [Test]
    public void Test_UserList_GetCurrentUser()
    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = UserList.AddUser($"{username}_{'v'}", avatar);
-        User w = UserList.AddUser($"{username}_{'w'}", avatar);
-        UserList.ChangeCurrentUser(2);
+        User u = userList.CreateAndAddNewUser($"{username}_{'u'}", avatar);
+        User v = userList.CreateAndAddNewUser($"{username}_{'v'}", avatar);
+        User w = userList.CreateAndAddNewUser($"{username}_{'w'}", avatar);
+        userList.ChangeCurrentUser(2);

-        User W = UserList.GetCurrentUser();
-        Assert.AreEqual(w.GetUsername(), W.GetUsername());
+        User W = userList.GetCurrentUser();
+        Assert.AreEqual(w, W);
    }

    /// <summary>
    /// Test whether a null user is returned when the userlist is empty
    /// </summary>
    [Test]
-    public void Test_UserList_GetCurrentUser_Empty()
+    public void Test_UserList_GetCurrent_Empty()
    {
-        User user = UserList.GetCurrentUser();
+        User user = userList.GetCurrentUser();
        Assert.IsNull(user);
    }

@@ -154,30 +157,24 @@ public class UserListTest
    /// Test whether the correct index is returned for the current user
    /// </summary>
    [Test]
-    public void Test_UserList_IndexOf_Valid()
+    public void Test_UserList_GetCurrentUserIndex()
    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = UserList.AddUser($"{username}_{'v'}", avatar);
-        User w = UserList.AddUser($"{username}_{'w'}", avatar);
-        UserList.ChangeCurrentUser(2);
+        User u = userList.CreateAndAddNewUser($"{username}_{'u'}", avatar);
+        User v = userList.CreateAndAddNewUser($"{username}_{'v'}", avatar);
+        User w = userList.CreateAndAddNewUser($"{username}_{'w'}", avatar);
+        userList.ChangeCurrentUser(2);

-        Assert.AreEqual(0, UserList.IndexOf(u.GetUsername()));
-        Assert.AreEqual(1, UserList.IndexOf(v.GetUsername()));
-        Assert.AreEqual(2, UserList.IndexOf(w.GetUsername()));
+        int idx = userList.GetCurrentUserIndex();
+        Assert.AreEqual(2, idx);
    }

    /// <summary>
-    /// Test whether the correct index is returned for the current user
+    /// Test whether a bad index is returned when the userlist is empty
    /// </summary>
    [Test]
-    public void Test_UserList_IndexOf_Exception()
+    public void Test_UserList_GetCurrentUserIndex_Empty()
    {
-        User u = new User(new PersistentDataController.SavedUserData()
-        {
-            username = username,
-            avatarIndex = 0
-        });
-        Assert.Throws<KeyNotFoundException>(delegate { UserList.IndexOf(u.GetUsername()); });
+        Assert.AreEqual(-1, userList.GetCurrentUserIndex());
    }

    /// <summary>
@@ -186,13 +183,13 @@ public class UserListTest
    [Test]
    public void Test_UserList_ChangeCurrentUser_ValidIndex()
    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = UserList.AddUser($"{username}_{'v'}", avatar);
-        User w = UserList.AddUser($"{username}_{'w'}", avatar);
-        UserList.ChangeCurrentUser(2);
+        User u = userList.CreateAndAddNewUser($"{username}_{'u'}", avatar);
+        User v = userList.CreateAndAddNewUser($"{username}_{'v'}", avatar);
+        User w = userList.CreateAndAddNewUser($"{username}_{'w'}", avatar);
+        userList.ChangeCurrentUser(2);

-        User W = UserList.GetCurrentUser();
-        Assert.AreEqual(w.GetUsername(), W.GetUsername());
+        User W = userList.GetCurrentUser();
+        Assert.AreEqual(w, W);
    }

    /// <summary>
@@ -201,11 +198,11 @@ public class UserListTest
    [Test]
    public void Test_UserList_ChangeCurrentUser_InvalidIndex()
    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = UserList.AddUser($"{username}_{'v'}", avatar);
-        User w = UserList.AddUser($"{username}_{'w'}", avatar);
-        Assert.Throws<IndexOutOfRangeException>(delegate { UserList.ChangeCurrentUser(-1); });
-        Assert.Throws<IndexOutOfRangeException>(delegate { UserList.ChangeCurrentUser(5); });
+        User u = userList.CreateAndAddNewUser($"{username}_{'u'}", avatar);
+        User v = userList.CreateAndAddNewUser($"{username}_{'v'}", avatar);
+        User w = userList.CreateAndAddNewUser($"{username}_{'w'}", avatar);
+        Assert.Throws<IndexOutOfRangeException>(delegate { userList.ChangeCurrentUser(-1); });
+        Assert.Throws<IndexOutOfRangeException>(delegate { userList.ChangeCurrentUser(5); });
    }

    /// <summary>
@@ -214,45 +211,41 @@ public class UserListTest
    [Test]
    public void Test_UserList_ChangeCurrentUser_IndexEmpty()
    {
-        Assert.Throws<IndexOutOfRangeException>(delegate { UserList.ChangeCurrentUser(0); });
+        Assert.Throws<IndexOutOfRangeException>(delegate { userList.ChangeCurrentUser(0); });
    }

    /// <summary>
    /// Test whether the current user is correctly changed
    /// </summary>
    [Test]
-    public void Test_UserList_ChangeCurrentUser_ValidUsername()
+    public void Test_UserList_ChangeCurrentUser_ValidUser()
    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = UserList.AddUser($"{username}_{'v'}", avatar);
-        User w = UserList.AddUser($"{username}_{'w'}", avatar);
-        UserList.ChangeCurrentUser(v.GetUsername());
-        User V = UserList.GetCurrentUser();
-        Assert.AreEqual(v.GetUsername(), V.GetUsername());
+        User u = userList.CreateAndAddNewUser($"{username}_{'u'}", avatar);
+        User v = userList.CreateAndAddNewUser($"{username}_{'v'}", avatar);
+        User w = userList.CreateAndAddNewUser($"{username}_{'w'}", avatar);
+        userList.ChangeCurrentUser(v);
+        User V = userList.GetCurrentUser();
+        Assert.AreEqual(v, V);
    }

    /// <summary>
    /// Test whether the current user is not changed when a non-existing user is given
    /// </summary>
    [Test]
-    public void Test_UserList_ChangeCurrentUser_InvalidUsername()
+    public void Test_UserList_ChangeCurrentUser_InvalidUser()
    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = new User(new PersistentDataController.SavedUserData()
-        {
-            username = $"{username}_{'v'}",
-            avatarIndex = 0
-        });
-        Assert.Throws<KeyNotFoundException>(delegate { UserList.ChangeCurrentUser(v.GetUsername()); });
+        User u = userList.CreateAndAddNewUser($"{username}_{'u'}", avatar);
+        User v = userList.CreateNewUser($"{username}_{'v'}", avatar);
+        Assert.Throws<KeyNotFoundException>(delegate { userList.ChangeCurrentUser(v); });
    }

    /// <summary>
    /// Test whether the current user is not changed when a null user is given
    /// </summary>
    [Test]
-    public void Test_UserList_ChangeCurrentUser_NullUsername()
+    public void Test_UserList_ChangeCurrentUser_NullUser()
    {
-        Assert.Throws<KeyNotFoundException>(delegate { UserList.ChangeCurrentUser(null); });
+        Assert.Throws<KeyNotFoundException>(delegate { userList.ChangeCurrentUser(null); });
    }

    /// <summary>
@@ -261,10 +254,10 @@ public class UserListTest
    [Test]
    public void Test_UserList_DeleteUser_ValidIndex()
    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = UserList.AddUser($"{username}_{'v'}", avatar);
-        User w = UserList.AddUser($"{username}_{'w'}", avatar);
-        Assert.IsTrue(UserList.DeleteUser(1));
+        User u = userList.CreateAndAddNewUser($"{username}_{'u'}", avatar);
+        User v = userList.CreateAndAddNewUser($"{username}_{'v'}", avatar);
+        User w = userList.CreateAndAddNewUser($"{username}_{'w'}", avatar);
+        Assert.IsTrue(userList.DeleteUser(1));
    }

    /// <summary>
@@ -273,11 +266,11 @@ public class UserListTest
    [Test]
    public void Test_UserList_DeleteUser_InValidIndex()
    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = UserList.AddUser($"{username}_{'v'}", avatar);
-        User w = UserList.AddUser($"{username}_{'w'}", avatar);
-        Assert.Throws<IndexOutOfRangeException>(delegate { UserList.DeleteUser(-1); });
-        Assert.Throws<IndexOutOfRangeException>(delegate { UserList.DeleteUser(5); });
+        User u = userList.CreateAndAddNewUser($"{username}_{'u'}", avatar);
+        User v = userList.CreateAndAddNewUser($"{username}_{'v'}", avatar);
+        User w = userList.CreateAndAddNewUser($"{username}_{'w'}", avatar);
+        Assert.IsFalse(userList.DeleteUser(-1));
+        Assert.IsFalse(userList.DeleteUser(5));
    }

    /// <summary>
@@ -286,61 +279,44 @@ public class UserListTest
    [Test]
    public void Test_UserList_DeleteUser_IndexEmpty()
    {
-        Assert.Throws<IndexOutOfRangeException>(delegate { UserList.DeleteUser(0); });
+        Assert.IsFalse(userList.DeleteUser(0));
    }

    /// <summary>
    /// Test whether deleting an existing user will correctly remove the user and set the currentUserIndex correctly
    /// </summary>
    [Test]
-    public void Test_UserList_DeleteUser_BeforeCurrentUser()
+    public void Test_UserList_DeleteUser_LastValid()
    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = UserList.AddUser($"{username}_{'v'}", avatar);
-        User w = UserList.AddUser($"{username}_{'w'}", avatar);
-        UserList.ChangeCurrentUser(1);
+        User u = userList.CreateAndAddNewUser($"{username}_{'u'}", avatar);
+        User v = userList.CreateAndAddNewUser($"{username}_{'v'}", avatar);
+        User w = userList.CreateAndAddNewUser($"{username}_{'w'}", avatar);
+        userList.ChangeCurrentUser(2);

-        Assert.AreEqual(3, UserList.GetUsers().Count);
-        Assert.AreEqual(1, UserList.IndexOf(UserList.GetCurrentUser().GetUsername()));
-        Assert.IsTrue(UserList.DeleteUser(u.GetUsername()));
-        Assert.AreEqual(2, UserList.GetUsers().Count);
-        Assert.AreEqual(0, UserList.IndexOf(UserList.GetCurrentUser().GetUsername()));
+        Assert.AreEqual(3, userList.GetUsers().Count);
+        Assert.AreEqual(2, userList.GetCurrentUserIndex());
+        Assert.IsTrue(userList.DeleteUser(w));
+        Assert.AreEqual(2, userList.GetUsers().Count);
+        Assert.AreEqual(1, userList.GetCurrentUserIndex());
    }

    /// <summary>
-    /// Test whether deleting an existing user will correctly remove the user and set the currentUserIndex correctly
+    /// Test whether deleting an existing user will remove the user correctly
    /// </summary>
+    /// <remarks>This will change the currentUserIndex to point to another user</remarks>
    [Test]
-    public void Test_UserList_DeleteUser_CurrentUser()
+    public void Test_UserList_DeleteUser_FirstValid()
    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = UserList.AddUser($"{username}_{'v'}", avatar);
-        User w = UserList.AddUser($"{username}_{'w'}", avatar);
-        UserList.ChangeCurrentUser(1);
+        User u = userList.CreateAndAddNewUser($"{username}_{'u'}", avatar);
+        User v = userList.CreateAndAddNewUser($"{username}_{'v'}", avatar);
+        User w = userList.CreateAndAddNewUser($"{username}_{'w'}", avatar);
+        userList.ChangeCurrentUser(0);

-        Assert.AreEqual(3, UserList.GetUsers().Count);
-        Assert.AreEqual(1, UserList.IndexOf(UserList.GetCurrentUser().GetUsername()));
-        Assert.IsTrue(UserList.DeleteUser(v.GetUsername()));
-        Assert.AreEqual(2, UserList.GetUsers().Count);
-        Assert.AreEqual(0, UserList.IndexOf(UserList.GetCurrentUser().GetUsername()));
-    }
-
-    /// <summary>
-    /// Test whether deleting an existing user will correctly remove the user and set the currentUserIndex correctly
-    /// </summary>
-    [Test]
-    public void Test_UserList_DeleteUser_AfterCurrentUser()
-    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = UserList.AddUser($"{username}_{'v'}", avatar);
-        User w = UserList.AddUser($"{username}_{'w'}", avatar);
-        UserList.ChangeCurrentUser(1);
-
-        Assert.AreEqual(3, UserList.GetUsers().Count);
-        Assert.AreEqual(1, UserList.IndexOf(UserList.GetCurrentUser().GetUsername()));
-        Assert.IsTrue(UserList.DeleteUser(w.GetUsername()));
-        Assert.AreEqual(2, UserList.GetUsers().Count);
-        Assert.AreEqual(1, UserList.IndexOf(UserList.GetCurrentUser().GetUsername()));
+        Assert.AreEqual(3, userList.GetUsers().Count);
+        Assert.AreEqual(0, userList.GetCurrentUserIndex());
+        Assert.IsTrue(userList.DeleteUser(u));
+        Assert.AreEqual(2, userList.GetUsers().Count);
+        Assert.AreEqual(0, userList.GetCurrentUserIndex());
    }

    /// <summary>
@@ -349,16 +325,12 @@ public class UserListTest
    [Test]
    public void Test_UserList_DeleteUser_Invalid()
    {
-        User u = UserList.AddUser($"{username}_{'u'}", avatar);
-        User v = new User(new PersistentDataController.SavedUserData()
-        {
-            username = $"{username}_{'v'}",
-            avatarIndex = 0
-        });
+        User u = userList.CreateAndAddNewUser($"{username}_{'u'}", avatar);
+        User v = userList.CreateNewUser($"{username}_{'v'}", avatar);

-        Assert.AreEqual(1, UserList.GetUsers().Count);
-        Assert.Throws<KeyNotFoundException>(delegate { UserList.DeleteUser(v.GetUsername()); });
-        Assert.AreEqual(1, UserList.GetUsers().Count);
+        Assert.AreEqual(1, userList.GetUsers().Count);
+        Assert.IsFalse(userList.DeleteUser(v));
+        Assert.AreEqual(1, userList.GetUsers().Count);
    }

    /// <summary>
@@ -367,14 +339,10 @@ public class UserListTest
    [Test]
    public void Test_UserList_DeleteUser_Empty()
    {
-        User user = new User(new PersistentDataController.SavedUserData()
-        {
-            username = username,
-            avatarIndex = 0
-        });
-        Assert.Zero(UserList.GetUsers().Count);
-        Assert.Throws<KeyNotFoundException>(delegate { UserList.DeleteUser(user.GetUsername()); });
-        Assert.Zero(UserList.GetUsers().Count);
+        User user = userList.CreateNewUser(username, avatar);
+        Assert.Zero(userList.GetUsers().Count);
+        Assert.IsFalse(userList.DeleteUser(user));
+        Assert.Zero(userList.GetUsers().Count);
    }

    /// <summary>
@@ -383,16 +351,23 @@ public class UserListTest
    [Test]
    public void Test_UserList_Save_New()
    {
+        if (File.Exists(PATH))
+        {
+            File.Delete(PATH);
+        }
+
        List<User> u = new List<User>();
        for (int i = 0; i < 5; i++)
-            u.Add(UserList.AddUser($"{username}_{i}", avatar));
-
-        UserList.ChangeCurrentUser(3);
-        UserList.Save();
+        {
+            u.Add(userList.CreateAndAddNewUser($"{username}_{i}", avatar));
+        }
+        userList.ChangeCurrentUser(3);
+        userList.Save();
        FileAssert.Exists(PATH);

        string content = File.ReadAllText(PATH);
-        string expected = $"{{\"version\":{PersistentDataController.VERSION},\"users\":[{{\"entries\":[],\"username\":\"u5erNam3_0\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}},{{\"entries\":[],\"username\":\"u5erNam3_1\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}},{{\"entries\":[],\"username\":\"u5erNam3_2\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}},{{\"entries\":[],\"username\":\"u5erNam3_3\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}},{{\"entries\":[],\"username\":\"u5erNam3_4\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":3,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        int id = avatar.GetInstanceID();
+        string expected = $"{{\"currentUserIndex\":3,\"storedUsers\":[{{\"username\":\"u5erNam3_0\",\"avatar\":{{\"instanceID\":{id}}},\"playtime\":0.0,\"courses\":[],\"minigames\":[]}},{{\"username\":\"u5erNam3_1\",\"avatar\":{{\"instanceID\":{id}}},\"playtime\":0.0,\"courses\":[],\"minigames\":[]}},{{\"username\":\"u5erNam3_2\",\"avatar\":{{\"instanceID\":{id}}},\"playtime\":0.0,\"courses\":[],\"minigames\":[]}},{{\"username\":\"u5erNam3_3\",\"avatar\":{{\"instanceID\":{id}}},\"playtime\":0.0,\"courses\":[],\"minigames\":[]}},{{\"username\":\"u5erNam3_4\",\"avatar\":{{\"instanceID\":{id}}},\"playtime\":0.0,\"courses\":[],\"minigames\":[]}}]}}";
        Assert.AreEqual(expected, content);
    }

@@ -410,14 +385,16 @@ public class UserListTest

        List<User> u = new List<User>();
        for (int i = 0; i < 5; i++)
-            u.Add(UserList.AddUser($"{username}_{i}", avatar));
-
-        UserList.ChangeCurrentUser(3);
-        UserList.Save();
+        {
+            u.Add(userList.CreateAndAddNewUser($"{username}_{i}", avatar));
+        }
+        userList.ChangeCurrentUser(3);
+        userList.Save();
        FileAssert.Exists(PATH);

        string content = File.ReadAllText(PATH);
-        string expected = $"{{\"version\":{PersistentDataController.VERSION},\"users\":[{{\"entries\":[],\"username\":\"u5erNam3_0\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}},{{\"entries\":[],\"username\":\"u5erNam3_1\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}},{{\"entries\":[],\"username\":\"u5erNam3_2\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}},{{\"entries\":[],\"username\":\"u5erNam3_3\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}},{{\"entries\":[],\"username\":\"u5erNam3_4\",\"avatarIndex\":0,\"playtime\":0.0,\"minigames\":[],\"courses\":[]}}],\"currentUser\":3,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        int id = avatar.GetInstanceID();
+        string expected = $"{{\"currentUserIndex\":3,\"storedUsers\":[{{\"username\":\"u5erNam3_0\",\"avatar\":{{\"instanceID\":{id}}},\"playtime\":0.0,\"courses\":[],\"minigames\":[]}},{{\"username\":\"u5erNam3_1\",\"avatar\":{{\"instanceID\":{id}}},\"playtime\":0.0,\"courses\":[],\"minigames\":[]}},{{\"username\":\"u5erNam3_2\",\"avatar\":{{\"instanceID\":{id}}},\"playtime\":0.0,\"courses\":[],\"minigames\":[]}},{{\"username\":\"u5erNam3_3\",\"avatar\":{{\"instanceID\":{id}}},\"playtime\":0.0,\"courses\":[],\"minigames\":[]}},{{\"username\":\"u5erNam3_4\",\"avatar\":{{\"instanceID\":{id}}},\"playtime\":0.0,\"courses\":[],\"minigames\":[]}}]}}";
        Assert.AreEqual(expected, content);
    }

@@ -427,11 +404,67 @@ public class UserListTest
    [Test]
    public void Test_UserList_Save_Empty()
    {
-        UserList.Save();
+        userList.Save();
        FileAssert.Exists(PATH);

        string content = File.ReadAllText(PATH);
-        string expected = $"{{\"version\":{PersistentDataController.VERSION},\"users\":[],\"currentUser\":-1,\"currentMinigame\":0,\"currentCourse\":0,\"currentTheme\":0}}";
+        string expected = "{\"currentUserIndex\":-1,\"storedUsers\":[]}";
        Assert.AreEqual(expected, content);
    }
+
+    /// <summary>
+    /// Test whether a userlist (containing some users) is correrctly loaded
+    /// </summary>
+    [Test]
+    public void Test_UserList_Load()
+    {
+        List<User> u = new List<User>();
+        for (int i = 0; i < 5; i++)
+        {
+            u.Add(userList.CreateAndAddNewUser($"{username}_{i}", avatar));
+        }
+        userList.ChangeCurrentUser(3);
+        userList.Save();
+
+        userList.Load();
+        Assert.AreEqual(userList.GetUsers().Count, u.Count);
+        Assert.AreEqual(userList.GetCurrentUserIndex(), 3);
+        List<User> v = userList.GetUsers();
+        for (int i = 0; i < 5; i++)
+        {
+            Assert.AreEqual(u[i].username, v[i].username);
+            Assert.AreEqual(u[i].avatar, v[i].avatar);
+        }
+    }
+
+    /// <summary>
+    /// Test whether an empty userlist is correctly loaded
+    /// </summary>
+    [Test]
+    public void Test_UserList_Load_Empty()
+    {
+        userList.Save();
+        userList.Load();
+        Assert.Zero(userList.GetUsers().Count);
+        Assert.AreEqual(-1, userList.GetCurrentUserIndex());
+    }
+
+    /// <summary>
+    /// Test if the user save file is not found, a new one will be created and an empty userlist will be loaded
+    /// </summary>
+    [Test]
+    public void Test_UserList_Load_NotFound()
+    {
+        List<User> u = new List<User>();
+        for (int i = 0; i < 5; i++)
+        {
+            u.Add(userList.CreateAndAddNewUser($"{username}_{i}", avatar));
+        }
+        userList.ChangeCurrentUser(3);
+        userList.Save();
+
+        File.Delete(PATH);
+        userList.Load();
+        Assert.Zero(userList.GetUsers().Count);
+    }
 }
--- a/Assets/Accounts/Tests/UserTest.cs
+++ b/Assets/Accounts/Tests/UserTest.cs
@@ -19,10 +19,7 @@ public class UserTest
    [SetUp]
    public void Setup_User()
    {
-        PersistentDataController.SavedUserData data = new PersistentDataController.SavedUserData();
-        data.username = "username";
-        data.avatarIndex = 0;
-        user = new User(data);
+        user = new User();
    }


@@ -33,8 +30,8 @@ public class UserTest
    public void Test_New_User()
    {
        Assert.NotNull(user);
-        Assert.Zero(user.GetCourses().Count);
-        Assert.Zero(user.GetMinigames().Count);
+        Assert.Zero(user.courses.Count);
+        Assert.Zero(user.minigames.Count);
    }

    /// <summary>
@@ -43,10 +40,10 @@ public class UserTest
    [Test]
    public void Test_User_AddCourse()
    {
-        var p = new PersistentDataController.SavedCourseProgress();
-        user.AddCourseProgress(p);
-        Assert.AreEqual(user.GetCourses().Count, 1);
-        Assert.Zero(user.GetMinigames().Count);
+        Progress p = new Progress();
+        user.courses.Add(p);
+        Assert.AreEqual(user.courses.Count, 1);
+        Assert.Zero(user.minigames.Count);
    }

    /// <summary>
@@ -55,10 +52,10 @@ public class UserTest
    [Test]
    public void Test_User_AddMinigame()
    {
-        var p = new PersistentDataController.SavedMinigameProgress();
-        user.AddMinigameProgress(p);
-        Assert.Zero(user.GetCourses().Count);
-        Assert.AreEqual(user.GetMinigames().Count, 1);
+        Progress p = new Progress();
+        user.minigames.Add(p);
+        Assert.Zero(user.courses.Count);
+        Assert.AreEqual(user.minigames.Count, 1);
    }

    /// <summary>
@@ -76,10 +73,10 @@ public class UserTest
    [Test]
    public void Test_User_GetRecentCourses_All()
    {
-        var p = new PersistentDataController.SavedCourseProgress();
-        p.courseIndex = CourseIndex.FINGERSPELLING;
-        p.progress = 0.5f;
-        user.AddCourseProgress(p);
+        Progress p = new Progress();
+        p.AddOrUpdate<CourseIndex>("courseIndex", CourseIndex.FINGERSPELLING);
+        p.AddOrUpdate<float>("courseProgress", 0.5f);
+        user.courses.Add(p);
        List<Tuple<CourseIndex, float>> list = user.GetRecentCourses();
        Assert.AreEqual(list.Count, 1);
        Assert.AreEqual(list[0].Item1, CourseIndex.FINGERSPELLING);
@@ -104,10 +101,10 @@ public class UserTest
    [Test]
    public void Test_User_GetRecommendedCourses_All()
    {
-        var p = new PersistentDataController.SavedCourseProgress();
-        p.courseIndex = CourseIndex.FINGERSPELLING;
-        p.progress = 0.5f;
-        user.AddCourseProgress(p);
+        Progress p = new Progress();
+        p.AddOrUpdate<CourseIndex>("courseIndex", CourseIndex.FINGERSPELLING);
+        p.AddOrUpdate<float>("courseProgress", 0.5f);
+        user.courses.Add(p);
        List<Tuple<CourseIndex, float>> list = user.GetRecommendedCourses();
        Assert.AreEqual(list.Count, 1);
        Assert.AreEqual(list[0].Item1, CourseIndex.FINGERSPELLING);
@@ -130,27 +127,13 @@ public class UserTest
    [Test]
    public void Test_User_GetCourseProgress_Valid()
    {
-        var p = new PersistentDataController.SavedCourseProgress();
-        p.courseIndex = CourseIndex.FINGERSPELLING;
-        p.progress = 3.14159265f;
-        user.AddCourseProgress(p);
-        var q = user.GetCourseProgress(CourseIndex.FINGERSPELLING);
-        Assert.AreEqual(q.courseIndex, CourseIndex.FINGERSPELLING);
-        Assert.AreEqual(q.progress, 3.14159265f);
-    }
-
-    /// <summary>
-    /// Test progress of a course is correctly reset (aka removed)
-    /// </summary>
-    [Test]
-    public void Test_User_ResetCourseProgres()
-    {
-        var p = new PersistentDataController.SavedCourseProgress();
-        p.courseIndex = CourseIndex.FINGERSPELLING;
-        user.AddCourseProgress(p);
-        Assert.IsNotNull(user.GetCourseProgress(CourseIndex.FINGERSPELLING));
-        user.ResetCourseProgress(CourseIndex.FINGERSPELLING);
-        Assert.IsNull(user.GetCourseProgress(CourseIndex.FINGERSPELLING));
+        Progress p = new Progress();
+        p.AddOrUpdate<CourseIndex>("courseIndex", CourseIndex.FINGERSPELLING);
+        p.AddOrUpdate<float>("courseProgress", 3.14159265f);
+        user.courses.Add(p);
+        Progress q = user.GetCourseProgress(CourseIndex.FINGERSPELLING);
+        Assert.AreEqual(q.Get<CourseIndex>("courseIndex"), CourseIndex.FINGERSPELLING);
+        Assert.AreEqual(q.Get<float>("courseProgress"), 3.14159265f);
    }

    /// <summary>
@@ -162,9 +145,9 @@ public class UserTest
        Assert.Null(user.GetMinigameProgress(MinigameIndex.SPELLING_BEE));
        Assert.Null(user.GetMinigameProgress((MinigameIndex)100));

-        var p = new PersistentDataController.SavedMinigameProgress();
-        p.minigameIndex = MinigameIndex.SPELLING_BEE;
-        user.AddMinigameProgress(p);
+        Progress p = new Progress();
+        p.AddOrUpdate<MinigameIndex>("minigameIndex", MinigameIndex.SPELLING_BEE);
+        user.minigames.Add(p);
        Assert.Null(user.GetMinigameProgress(MinigameIndex.HANGMAN));
    }

@@ -174,26 +157,10 @@ public class UserTest
    [Test]
    public void Test_User_GetMinigameProgress_Valid()
    {
-        var p = new PersistentDataController.SavedMinigameProgress();
-        p.minigameIndex = MinigameIndex.SPELLING_BEE;
-        user.AddMinigameProgress(p);
-        var q = user.GetMinigameProgress(MinigameIndex.SPELLING_BEE);
-        Assert.AreEqual(q.minigameIndex, MinigameIndex.SPELLING_BEE);
-        Assert.Zero(q.latestScores.Count);
-        Assert.Zero(q.highestScores.Count);
-    }
-
-    /// <summary>
-    /// Test progress of a minigame is correctly reset (aka removed)
-    /// </summary>
-    [Test]
-    public void Test_User_ResetMinigameProgres()
-    {
-        var p = new PersistentDataController.SavedMinigameProgress();
-        p.minigameIndex = MinigameIndex.SPELLING_BEE;
-        user.AddMinigameProgress(p);
-        Assert.IsNotNull(user.GetMinigameProgress(MinigameIndex.SPELLING_BEE));
-        user.ResetMinigameProgress(MinigameIndex.SPELLING_BEE);
-        Assert.IsNull(user.GetMinigameProgress(MinigameIndex.SPELLING_BEE));
+        Progress p = new Progress();
+        p.AddOrUpdate<MinigameIndex>("minigameIndex", MinigameIndex.SPELLING_BEE);
+        user.minigames.Add(p);
+        Progress q = user.GetMinigameProgress(MinigameIndex.SPELLING_BEE);
+        Assert.AreEqual(q.Get<CourseIndex>("minigameIndex"), CourseIndex.FINGERSPELLING);
    }
 }
--- a/Assets/Common/Fonts/Korolev
+++ b/Assets/Common/Fonts/Korolev
--- a/Assets/Common/Fonts/contb
+++ b/Assets/Common/Fonts/contb
--- a/Assets/Common/Fonts/contb.ttf
+++ b/Assets/Common/Fonts/contb.ttf
--- a/Assets/Common/Fonts/contb.ttf.meta
+++ b/Assets/Common/Fonts/contb.ttf.meta
@@ -1,21 +0,0 @@
-fileFormatVersion: 2
-guid: a963d5f9cc80b6e409b0aac9c1ad2531
-TrueTypeFontImporter:
-  externalObjects: {}
-  serializedVersion: 4
-  fontSize: 16
-  forceTextureCase: -2
-  characterSpacing: 0
-  characterPadding: 1
-  includeFontData: 1
-  fontNames:
-  - Continuum Bold
-  fallbackFontReferences: []
-  customCharacters: 
-  fontRenderingMode: 0
-  ascentCalculationMode: 1
-  useLegacyBoundsCalculation: 0
-  shouldRoundAdvanceValue: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/Animals/dolfijn.png.meta
+++ b/Assets/Common/Images/Animals/dolfijn.png.meta
@@ -113,18 +113,6 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/Assets/Common/Images/Menus/Close.png
+++ b/Assets/Common/Images/Menus/Close.png
--- a/Assets/Common/Images/Menus/Close.png.meta
+++ b/Assets/Common/Images/Menus/Close.png.meta
--- a/Assets/Common/Images/CourseThumbnails/ClothesThumbnail.png
+++ b/Assets/Common/Images/CourseThumbnails/ClothesThumbnail.png
--- a/Assets/Common/Images/CourseThumbnails/FingerspellingThumbnail.png
+++ b/Assets/Common/Images/CourseThumbnails/FingerspellingThumbnail.png
--- a/Assets/Common/Images/HandGestures/A_vorm.png
+++ b/Assets/Common/Images/HandGestures/A_vorm.png
--- a/Assets/Common/Images/HandGestures/A_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/A_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: ed5c09a22f5dcb3498f246f9490aa533
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/B_vorm.png
+++ b/Assets/Common/Images/HandGestures/B_vorm.png
--- a/Assets/Common/Images/HandGestures/B_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/B_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 8e050dadd89377d4fb62a4ad8f9e8535
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/C_vorm.png
+++ b/Assets/Common/Images/HandGestures/C_vorm.png
--- a/Assets/Common/Images/HandGestures/C_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/C_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 330c40bb91dc4b545829054df966ea97
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/D_vorm.png
+++ b/Assets/Common/Images/HandGestures/D_vorm.png
--- a/Assets/Common/Images/HandGestures/D_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/D_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: bd9ec5405bb0fea449e9da0f88c524b3
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/E_vorm.png
+++ b/Assets/Common/Images/HandGestures/E_vorm.png
--- a/Assets/Common/Images/HandGestures/E_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/E_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: de823bdd2e36be047a6c7937e5bf5cda
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/F_vorm.png
+++ b/Assets/Common/Images/HandGestures/F_vorm.png
--- a/Assets/Common/Images/HandGestures/F_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/F_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 044b86526fb6697488bbacdc1d76fa03
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/G_vorm.png
+++ b/Assets/Common/Images/HandGestures/G_vorm.png
--- a/Assets/Common/Images/HandGestures/G_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/G_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 8e61bbc6d63e9d14f88136e81a0b9d84
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/H_vorm.png
+++ b/Assets/Common/Images/HandGestures/H_vorm.png
--- a/Assets/Common/Images/HandGestures/H_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/H_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: ed4e4023600c05347874842b68f62231
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/I_vorm.png
+++ b/Assets/Common/Images/HandGestures/I_vorm.png
--- a/Assets/Common/Images/HandGestures/I_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/I_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: d5bbee7ab92ab2149bffdcd93b93a2d3
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/J_vorm.png
+++ b/Assets/Common/Images/HandGestures/J_vorm.png
--- a/Assets/Common/Images/HandGestures/J_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/J_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 32df0c392f6fbfe4faa3bd6f0f009b7a
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/K_vorm.png
+++ b/Assets/Common/Images/HandGestures/K_vorm.png
--- a/Assets/Common/Images/HandGestures/K_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/K_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 54e8aaec5729e0b438b755ce1c5b8c9f
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/L_vorm.png
+++ b/Assets/Common/Images/HandGestures/L_vorm.png
--- a/Assets/Common/Images/HandGestures/L_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/L_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: c042d24972c09f849854641b82d164bf
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/M_vorm.png
+++ b/Assets/Common/Images/HandGestures/M_vorm.png
--- a/Assets/Common/Images/HandGestures/M_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/M_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 6014df6c8e5794c4c91b3d7c636b073f
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/N_vorm.png
+++ b/Assets/Common/Images/HandGestures/N_vorm.png
--- a/Assets/Common/Images/HandGestures/N_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/N_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 4a88b6a6c8a4bf5479b9c033313c20dc
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/O_vorm.png
+++ b/Assets/Common/Images/HandGestures/O_vorm.png
--- a/Assets/Common/Images/HandGestures/O_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/O_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 13dd6d407842cbc41a74312f86a7451a
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/P_vorm.png
+++ b/Assets/Common/Images/HandGestures/P_vorm.png
--- a/Assets/Common/Images/HandGestures/P_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/P_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: de3b948a0c6e04547afffebadd53c44e
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/Q_vorm.png
+++ b/Assets/Common/Images/HandGestures/Q_vorm.png
--- a/Assets/Common/Images/HandGestures/Q_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/Q_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 189b131f13ce67844933e28c6d031cad
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/R_vorm.png
+++ b/Assets/Common/Images/HandGestures/R_vorm.png
--- a/Assets/Common/Images/HandGestures/R_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/R_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: a05e3762c949b83428dc2baf99ab1b34
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/S_vorm.png
+++ b/Assets/Common/Images/HandGestures/S_vorm.png
--- a/Assets/Common/Images/HandGestures/S_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/S_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 5c157ea40838eb74f8226c89a7244613
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/T_vorm.png
+++ b/Assets/Common/Images/HandGestures/T_vorm.png
--- a/Assets/Common/Images/HandGestures/T_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/T_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: ecd6f60f1bc981b4fb5082ac07e69b6f
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/U_vorm.png
+++ b/Assets/Common/Images/HandGestures/U_vorm.png
--- a/Assets/Common/Images/HandGestures/U_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/U_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: c81ae3b4548e432498e92c09b4f6d0c9
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/V_vorm.png
+++ b/Assets/Common/Images/HandGestures/V_vorm.png
--- a/Assets/Common/Images/HandGestures/V_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/V_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 5ab8fc41b65050e4a884ef7ac126318b
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/W_vorm.png
+++ b/Assets/Common/Images/HandGestures/W_vorm.png
--- a/Assets/Common/Images/HandGestures/W_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/W_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: f345e4c4670a26e43bb67fdd98d17aa5
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/X_vorm.png
+++ b/Assets/Common/Images/HandGestures/X_vorm.png
--- a/Assets/Common/Images/HandGestures/X_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/X_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 2c38602225a250a45be1017aab650a3d
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/Y_vorm.png
+++ b/Assets/Common/Images/HandGestures/Y_vorm.png
--- a/Assets/Common/Images/HandGestures/Y_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/Y_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: 6f880b9858734b34e8d014189cf0535e
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/HandGestures/Z_vorm.png
+++ b/Assets/Common/Images/HandGestures/Z_vorm.png
--- a/Assets/Common/Images/HandGestures/Z_vorm.png.meta
+++ b/Assets/Common/Images/HandGestures/Z_vorm.png.meta
@@ -1,135 +0,0 @@
-fileFormatVersion: 2
-guid: de44788bbe2193043a246d12d2df52e5
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Common/Images/House/Appartement.png
+++ b/Assets/Common/Images/House/Appartement.png
--- a/Assets/Common/Images/House/Badkamer.png
+++ b/Assets/Common/Images/House/Badkamer.png
--- a/Assets/Common/Images/House/Bed.png
+++ b/Assets/Common/Images/House/Bed.png
--- a/Assets/Common/Images/House/Bureau.png
+++ b/Assets/Common/Images/House/Bureau.png
--- a/Assets/Common/Images/House/Chalet.png
+++ b/Assets/Common/Images/House/Chalet.png
--- a/Assets/Common/Images/House/Gang.png
+++ b/Assets/Common/Images/House/Gang.png
--- a/Assets/Common/Images/House/Huis.png
+++ b/Assets/Common/Images/House/Huis.png
--- a/Assets/Common/Images/House/Kast.png
+++ b/Assets/Common/Images/House/Kast.png
--- a/Assets/Common/Images/House/Keuken.png
+++ b/Assets/Common/Images/House/Keuken.png
--- a/Assets/Common/Images/House/Kleerkast.png
+++ b/Assets/Common/Images/House/Kleerkast.png
--- a/Assets/Common/Images/House/Living.png
+++ b/Assets/Common/Images/House/Living.png
--- a/Assets/Common/Images/House/Slaapkamer.png
+++ b/Assets/Common/Images/House/Slaapkamer.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jelle De Geest	2e63e28173	Merge branch 'development' into 'main' Sprint 3 Closes WES-88, WES-89, WES-113, WES-75, WES-97, WES-80, WES-90, WES-95, WES-99, and WES-76 See merge request wesign/unity-application!67	2023-03-26 21:23:18 +00:00
Jelle De Geest	c6faf3bf6f	Sprint 3	2023-03-26 21:23:17 +00:00
jeldgees	17da4e8558	Merge branch 'main' of gitlab.ilabt.imec.be:wesign/unity-application	2023-03-12 23:15:56 +01:00
Louis Adriaens	cdb600344f	fix	2023-03-12 22:12:14 +00:00
Louis Adriaens	d94457e246	default reviewers added	2023-03-12 22:07:09 +00:00
jeldgees	6f72e29564	Sprint 2	2023-03-12 23:05:30 +01:00
Louis Adriaens	69da4d3def	Update merge request template	2023-03-12 20:46:22 +00:00
Louis Adriaens	be0acbe025	Default merge request template	2023-03-09 16:44:40 +00:00
Louis Adriaens	b5568a908a	Update .gitlab/issue_templates/Default.md	2023-03-09 16:42:27 +00:00
Louis Adriaens	22e6cb27f8	Add new file	2023-03-09 16:40:10 +00:00
Louis Adriaens	88dc81eb22	Add new file	2023-03-09 16:36:18 +00:00
Jelle De Geest	ee81efc8d9	Merge branch 'development' into 'main' Sprint 1 See merge request wesign/unity-application!7	2023-02-26 18:21:47 +00:00
Dries Van Schuylenbergh	be92ef06f4	Merge branch 'development' into 'main' Development See merge request wesign/unity-application!2	2023-02-25 09:07:17 +00:00
Dries Van Schuylenbergh	8a0f506584	Update README.md	2023-02-24 20:21:00 +01:00