diff --git a/slaeforms/static/videos/0009-inflected.mp4 b/slaeforms/static/videos/0009-inflected.mp4
new file mode 100644
index 0000000..d4ebf52
Binary files /dev/null and b/slaeforms/static/videos/0009-inflected.mp4 differ
diff --git a/slaeforms/static/videos/0009-mocap.mp4 b/slaeforms/static/videos/0009-mocap.mp4
new file mode 100644
index 0000000..d673e96
Binary files /dev/null and b/slaeforms/static/videos/0009-mocap.mp4 differ
diff --git a/slaeforms/static/videos/0009-simple.mp4 b/slaeforms/static/videos/0009-simple.mp4
new file mode 100644
index 0000000..c044ad9
Binary files /dev/null and b/slaeforms/static/videos/0009-simple.mp4 differ
diff --git a/slaeforms/static/videos/0009-variation-wide.mp4 b/slaeforms/static/videos/0009-variation-wide.mp4
new file mode 100644
index 0000000..1e4bbda
Binary files /dev/null and b/slaeforms/static/videos/0009-variation-wide.mp4 differ
diff --git a/slaeforms/static/videos/0018-inflected.mp4 b/slaeforms/static/videos/0018-inflected.mp4
new file mode 100644
index 0000000..c99ec70
Binary files /dev/null and b/slaeforms/static/videos/0018-inflected.mp4 differ
diff --git a/slaeforms/static/videos/0018-mocap.mp4 b/slaeforms/static/videos/0018-mocap.mp4
new file mode 100644
index 0000000..90c12db
Binary files /dev/null and b/slaeforms/static/videos/0018-mocap.mp4 differ
diff --git a/slaeforms/static/videos/0018-simple.mp4 b/slaeforms/static/videos/0018-simple.mp4
new file mode 100644
index 0000000..463cebf
Binary files /dev/null and b/slaeforms/static/videos/0018-simple.mp4 differ
diff --git a/slaeforms/static/videos/0020-inflected.mp4 b/slaeforms/static/videos/0020-inflected.mp4
new file mode 100644
index 0000000..52f8101
Binary files /dev/null and b/slaeforms/static/videos/0020-inflected.mp4 differ
diff --git a/slaeforms/static/videos/0020-mocap.mp4 b/slaeforms/static/videos/0020-mocap.mp4
new file mode 100644
index 0000000..9724011
Binary files /dev/null and b/slaeforms/static/videos/0020-mocap.mp4 differ
diff --git a/slaeforms/static/videos/0020-simple.mp4 b/slaeforms/static/videos/0020-simple.mp4
new file mode 100644
index 0000000..c20dadb
Binary files /dev/null and b/slaeforms/static/videos/0020-simple.mp4 differ
diff --git a/slaeforms/static/videos/0021-inflected.mp4 b/slaeforms/static/videos/0021-inflected.mp4
new file mode 100644
index 0000000..9a2bc5b
Binary files /dev/null and b/slaeforms/static/videos/0021-inflected.mp4 differ
diff --git a/slaeforms/static/videos/0021-mocap.mp4 b/slaeforms/static/videos/0021-mocap.mp4
new file mode 100644
index 0000000..d752987
Binary files /dev/null and b/slaeforms/static/videos/0021-mocap.mp4 differ
diff --git a/slaeforms/static/videos/0021-simple.mp4 b/slaeforms/static/videos/0021-simple.mp4
new file mode 100644
index 0000000..5e71308
Binary files /dev/null and b/slaeforms/static/videos/0021-simple.mp4 differ
diff --git a/slaeforms/static/videos/0022-inflected.mp4 b/slaeforms/static/videos/0022-inflected.mp4
new file mode 100644
index 0000000..2c189d4
Binary files /dev/null and b/slaeforms/static/videos/0022-inflected.mp4 differ
diff --git a/slaeforms/static/videos/0022-mocap.mp4 b/slaeforms/static/videos/0022-mocap.mp4
new file mode 100644
index 0000000..c4b3d04
Binary files /dev/null and b/slaeforms/static/videos/0022-mocap.mp4 differ
diff --git a/slaeforms/static/videos/0022-simple.mp4 b/slaeforms/static/videos/0022-simple.mp4
new file mode 100644
index 0000000..c54758d
Binary files /dev/null and b/slaeforms/static/videos/0022-simple.mp4 differ
diff --git a/slaeforms/static/videos/GLEISvariations.mp4 b/slaeforms/static/videos/GLEISvariations.mp4
new file mode 100644
index 0000000..b8af137
Binary files /dev/null and b/slaeforms/static/videos/GLEISvariations.mp4 differ
diff --git a/slaeforms/templates/standard_template.html b/slaeforms/templates/standard_template.html
index 9af8a0d..a55c077 100644
--- a/slaeforms/templates/standard_template.html
+++ b/slaeforms/templates/standard_template.html
@@ -13,6 +13,12 @@
         allowfullscreen></iframe>
 </div>
 
+{% elif (embed == "no") %}
+
+<video controls>
+    <source src="{{ url_for('static', filename='videos/' + video_url) }}" type="video/mp4">
+</video>
+
 {% else %}
 {{code}}
 {% endif %}
@@ -36,7 +42,7 @@
         </div>
     </div>
 
-    
+
 
     <div class="dv_half">
         <div class="iframe-container">
@@ -47,7 +53,24 @@
     </div>
 
 </div>
+{% elif (embed == "no") %}
+<div class="double_video_container"></div>
+<div class="dv_half">
+    <div class="iframe-container">
+        <video controls>
+            <source src="{{ url_for('static', filename='videos/' + video_url) }}" type="video/mp4">
+        </video>
+    </div>
+</div>
+<div class="dv_half"></div>
+<div class="iframe-container">
+    <video controls>
+        <source src="{{ url_for('static', filename='videos/' + video_url) }}" type="video/mp4">
+    </video>
+</div>
+</div>
 
+</div>
 {% else %}
 {{code}}
 {% endif %}
@@ -96,20 +119,20 @@ step={{question["step"]}}
         {% if (infovideo) %}
         <dialog>
 
-            <button class="dialogBtn" autofocus><img class="infoButtonIcon" id="buttonClose" src="{{ url_for('static', filename='icons/x-icon.png')}}"
-                alt="Delete Icon"></button>
+            <button class="dialogBtn" autofocus><img class="infoButtonIcon" id="buttonClose"
+                    src="{{ url_for('static', filename='icons/x-icon.png')}}" alt="Delete Icon"></button>
             <div class="iframe-container">
                 <iframe class="center" src="{{ infovideo['videourl'] }}" title="YouTube video player" frameborder="0"
                     allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
                     allowfullscreen></iframe>
             </div>
             <div class="dialogTextContainer">
-            <p>{{ infovideo["infotext"] }}</p>
+                <p>{{ infovideo["infotext"] }}</p>
             </div>
-            </dialog>
-        <button class="dialogBtn"><img class="infoButtonIcon" id="buttonInfoIcon" src="{{ url_for('static', filename='icons/info-icon.png')}}"
-                alt="Info Icon"></button>
-                <script src="{{ url_for('static', filename='infoDialogScript.js')}}"></script>
+        </dialog>
+        <button class="dialogBtn"><img class="infoButtonIcon" id="buttonInfoIcon"
+                src="{{ url_for('static', filename='icons/info-icon.png')}}" alt="Info Icon"></button>
+        <script src="{{ url_for('static', filename='infoDialogScript.js')}}"></script>
         {% endif %}
 
 
@@ -124,7 +147,7 @@ step={{question["step"]}}
         {% endif %}
 
         <form class="formlayout" id="question_form" action="{{ url_for('sendpage') }}" method="post">
-            
+
             {% for question in questions %}
             {% if (questions[question]["type"] == "likert") %}
             <div class="likercontainer">
@@ -132,7 +155,7 @@ step={{question["step"]}}
                 <div class="likert" style="--likert-rows: {{ questions[question]['points']|length() }}">
                     {% for point in questions[question]["points"] %}
                     <label>
-                        <input  class="inputs" name="{{ questions[question]['name']}}" type="radio"
+                        <input class="inputs" name="{{ questions[question]['name']}}" type="radio"
                             id="{{ questions[question]['name'] }}"
                             value="{{ questions[question]['points'][point]['value'] }}"
                             {{required(questions[question])}} /><span>{{ questions[question]['points'][point]['text']
@@ -145,33 +168,35 @@ step={{question["step"]}}
             <div class="textarea-container">
                 <label class="textarea-label">
                     {{ questions[question]['text']}}
-                    <textarea class="inputs" id="{{ questions[question]['name'] }}" name="{{ questions[question]['name'] }}" rows="6"
-                        cols="60" maxlength="{{ questions[question]['size'] }}"
-                        {{required(questions[question])}}></textarea>
+                    <textarea class="inputs" id="{{ questions[question]['name'] }}"
+                        name="{{ questions[question]['name'] }}" rows="6" cols="60"
+                        maxlength="{{ questions[question]['size'] }}" {{required(questions[question])}}></textarea>
                 </label>
             </div>
 
             {% elif (questions[question]["type"] == "dateinput") %}
             <div class="compressWidth">
                 <label>
-                    {{ questions[question]['text']}}<input class="inputs" type="date" name="{{ questions[question]['name']}}"
-                        id="{{ questions[question]['name'] }}" {{required(questions[question])}}>
+                    {{ questions[question]['text']}}<input class="inputs" type="date"
+                        name="{{ questions[question]['name']}}" id="{{ questions[question]['name'] }}"
+                        {{required(questions[question])}}>
                 </label>
             </div>
             {% elif (questions[question]["type"] == "numberinput") %}
             <div class="compressWidth">
                 <label>
-                    {{ questions[question]['text']}}<input class="inputs" type="number" name="{{ questions[question]['name']}}"
-                        id="{{ questions[question]['name'] }}" {{inputconfig(questions[question])}}
-                        {{required(questions[question])}}>
+                    {{ questions[question]['text']}}<input class="inputs" type="number"
+                        name="{{ questions[question]['name']}}" id="{{ questions[question]['name'] }}"
+                        {{inputconfig(questions[question])}} {{required(questions[question])}}>
                 </label>
             </div>
 
             {% elif (questions[question]["type"] == "emailinput") %}
             <div class="compressWidth">
                 <label>
-                    {{ questions[question]['text']}}<input class="inputs" type="email" name="{{ questions[question]['name']}}"
-                        id="{{ questions[question]['name'] }}" {{required(questions[question])}}>
+                    {{ questions[question]['text']}}<input class="inputs" type="email"
+                        name="{{ questions[question]['name']}}" id="{{ questions[question]['name'] }}"
+                        {{required(questions[question])}}>
                 </label>
             </div>
 
@@ -199,8 +224,9 @@ step={{question["step"]}}
 
                     {% for point in questions[question]["points"] %}
                     <label for="{{ point }}">
-                    <input type="checkbox" id="{{ point }}" name="{{ questions[question]['name'] }}" value="{{ questions[question]['points'][point]['value'] }}">
-                    {{ questions[question]['points'][point]['text']}}</label>
+                        <input type="checkbox" id="{{ point }}" name="{{ questions[question]['name'] }}"
+                            value="{{ questions[question]['points'][point]['value'] }}">
+                        {{ questions[question]['points'][point]['text']}}</label>
 
                     {% endfor %}
                 </label>
diff --git a/slaeforms/userstudy1.json b/slaeforms/userstudy1.json
index b5ab647..988a675 100644
--- a/slaeforms/userstudy1.json
+++ b/slaeforms/userstudy1.json
@@ -12,7 +12,7 @@
             "question1_alter": {
                 "type": "numberinput",
                 "name": "alter",
-                "text": "Wie alt sind sie?",
+                "text": "1. Wie alt sind sie?",
                 "required": "true",
                 "min": "1",
                 "max": "120"
@@ -20,7 +20,7 @@
             "question2_geschlecht": {
                 "type": "dropdowninput",
                 "name": "geschlecht",
-                "text": "Wie ist ihr Geschlecht?",
+                "text": "2. Wie ist ihr Geschlecht?",
                 "required": "true",
                 "defaulttext": "",
                 "points": {
@@ -123,7 +123,7 @@
             "question5_wann_gehörlos": {
                 "type": "numberinput",
                 "name": "wann_gehörlos",
-                "text": "In welchem Alter wurden sie gehörlos/schwerhörig? (\"0\" für ab Geburt, \"-1\" falls sie hören können)",
+                "text": "In welchem Alter wurden sie gehörlos/schwerhörig? (\"0\" für ab Geburt, \"-1\" falls sie hörend sind)",
                 "required": "true",
                 "min": "-1",
                 "max": "120"
@@ -199,24 +199,7 @@
                     }
                 }
             },
-            "question10_schule": {
-                "type": "dropdowninput",
-                "name": "schule",
-                "text": "Haben sie eine Förderschule für Gehörlose und Schwerhörige besucht?",
-                "required": "true",
-                "defaulttext": "",
-                "points": {
-                    "ja": {
-                        "value": "Ja",
-                        "text": "Ja"
-                    },
-                    "Nein": {
-                        "value": "Nein",
-                        "text": "Nein"
-                    }
-                }
-            },
-            "question11_avatar_erfahrung": {
+            "question10_avatar_erfahrung": {
                 "type": "dropdowninput",
                 "name": "avatar_erfahrung",
                 "text": "Haben sie schonmal Computeranimationen von Gebärdensprache gesehen? (Gebärdenavatare)",
@@ -306,15 +289,24 @@
             "type": "single_video",
             "order": "random",
             "list": {
-                "video_1": "https://www.youtube-nocookie.com/embed/iI2bjpgLgu0?si=pWWwitq8Tl9zAs04",
-                "video_2": "https://www.youtube-nocookie.com/embed/R_LNEJiShRM?si=vm5mj-xs04nfijkf",
-                "video_3": "https://www.youtube-nocookie.com/embed/DJnHVnT2YEk?si=e6qe7nrHaRYJ3NQe",
-                "video_4": "https://www.youtube-nocookie.com/embed/6BTZn7tqSzk?si=jQH8RHGMIP9ARsT5",
-                "video_5": "https://www.youtube-nocookie.com/embed/bCRqmhWjuCk?si=iM2dwOSTosLq08Pr",
-                "video_6": "https://www.youtube-nocookie.com/embed/hgE2k8y9-qc?si=kR2rshmVcb9P70r0"
+                "video_1": "0009-inflected.mp4",
+                "video_2": "0009-mocap.mp4",
+                "video_3": "0009-simple.mp4",
+                "video_4": "0018-inflected.mp4",
+                "video_5": "0018-mocap.mp4",
+                "video_6": "0018-simple.mp4",
+                "video_7": "0020-inflected.mp4",
+                "video_8": "0020-mocap.mp4",
+                "video_9": "0020-simple.mp4",
+                "video_10": "0021-inflected.mp4",
+                "video_11": "0021-mocap.mp4",
+                "video_12": "0021-simple.mp4",
+                "video_13": "0022-inflected.mp4",
+                "video_14": "0022-mocap.mp4",
+                "video_15": "0022-simple.mp4"
             },
             "configuration": {
-                "embed": "yt"
+                "embed": "no"
             }
         },
         "questions": {