diff --git a/Assets/Common/Interfaces/Theme.cs b/Assets/Common/Interfaces/Theme.cs
index 3fa31b5..9ddf25d 100644
--- a/Assets/Common/Interfaces/Theme.cs
+++ b/Assets/Common/Interfaces/Theme.cs
@@ -23,11 +23,6 @@ public class Theme : ScriptableObject
     /// </summary>
     public ThemeIndex index;
 
-    /// <summary>
-    /// Reference to the model used in the SignPredictor
-    /// </summary>
-    public NNModel model;
-
     /// <summary>
     /// The index of the model you want to use
     /// </summary>
diff --git a/Assets/Common/Scripts/CommonScripts.asmdef b/Assets/Common/Scripts/CommonScripts.asmdef
index 8b1a1ba..8cd1fb2 100644
--- a/Assets/Common/Scripts/CommonScripts.asmdef
+++ b/Assets/Common/Scripts/CommonScripts.asmdef
@@ -6,7 +6,8 @@
         "GUID:63c63e721f65ebb7d871cb9ef49f4752",
         "GUID:1631ed2680c61245b8211d943c1639a8",
         "GUID:5c2b5ba89f9e74e418232e154bc5cc7a",
-        "GUID:7f2d0ee6dd21e1d4eb25b71b7a749d25"
+        "GUID:7f2d0ee6dd21e1d4eb25b71b7a749d25",
+        "GUID:d0b6b39a21908f94fbbd9f2c196a9725"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Assets/Common/Scripts/CourseActivityScreen.cs b/Assets/Common/Scripts/CourseActivityScreen.cs
index ab0cdb4..40302fa 100644
--- a/Assets/Common/Scripts/CourseActivityScreen.cs
+++ b/Assets/Common/Scripts/CourseActivityScreen.cs
@@ -56,8 +56,8 @@ public class CourseActivityScreen : MonoBehaviour
         Course course = courseList.courses[index];
 
         // vvv TEMPORARY STUFF vvv
-        playButton.SetActive(course.theme.model != null);
-        previewButton.SetActive(course.theme.model == null);
+        playButton.SetActive(course.theme.modelIndex != ModelIndex.NONE);
+        previewButton.SetActive(course.theme.modelIndex == ModelIndex.NONE);
         // ^^^ TEMPORARY STUFF ^^^
 
         title.text = course.title;
diff --git a/Assets/Courses/Scripts/TemplateCourse.cs b/Assets/Courses/Scripts/TemplateCourse.cs
index 11a75cb..8bc2ad9 100644
--- a/Assets/Courses/Scripts/TemplateCourse.cs
+++ b/Assets/Courses/Scripts/TemplateCourse.cs
@@ -134,8 +134,8 @@ public class TemplateCourse : MonoBehaviour
         maxWords = course.theme.learnables.Count;
 
         // vvv TEMPORARY STUFF vvv
-        feedbackProgressBar.SetActive(course.theme.model != null);
-        previewMessage.SetActive(course.theme.model == null);
+        feedbackProgressBar.SetActive(course.theme.modelIndex != ModelIndex.NONE);
+        previewMessage.SetActive(course.theme.modelIndex == ModelIndex.NONE);
         // Instead, the NONE-modelIndex points to Fingerspelling, which gives the same result
         //feedback.signPredictor.model = previewModel;
         // ^^^ TEMPORARY STUFF ^^^