diff --git a/composer.json b/composer.json
index 92f9c76e..a2ddce03 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,8 @@
             "inc/functions/theme.php",
             "inc/driver/http-driver.php",
             "inc/driver/log-driver.php",
-            "inc/service/captcha-queries.php"
+            "inc/service/captcha-queries.php",
+            "inc/context.php"
         ]
     },
     "license": "Tinyboard + vichan",
diff --git a/templates/main.js b/templates/main.js
index f956f5cf..13c80c33 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -222,7 +222,7 @@ function getCookie(cookie_name) {
 	}
 }
 
-{% endraw %}
+{% endverbatim %}
 {% if config.captcha.dynamic %}
 function is_dynamic_captcha_enabled() {
 	let cookie = get_cookie('require-captcha');
@@ -230,7 +230,7 @@ function is_dynamic_captcha_enabled() {
 }
 
 function get_captcha_pub_key() {
-{% if config.captcha.provider === 'recaptcha' %}
+{% if config.captcha.provider == 'recaptcha' %}
 	return "{{ config.captcha.recaptcha.sitekey }}";
 {% else %}
 	return null;
@@ -250,7 +250,7 @@ function init_dynamic_captcha() {
 	}
 }
 {% endif %}
-{% raw %}
+{% verbatim %}
 
 function highlightReply(id) {
 	if (typeof window.event != "undefined" && event.which == 2) {
diff --git a/templates/post_form.html b/templates/post_form.html
index 038395fa..64aff382 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -100,7 +100,7 @@
 			</td>
 		</tr>
 		{% endif %}
-		{% if config.captcha.enabled %}
+		{% if config.captcha.provider == 'native' %}
 		<tr class='captcha'>
 			<th>
 				{% trans %}Verification{% endtrans %}
@@ -115,7 +115,7 @@
 				</noscript>
 			</td>
 		</tr>
-			{% elseif config.new_thread_capt %}
+		{% elseif config.captcha.native.new_thread_capt %}
 			{% if not id %}
  			<tr class='captcha'>
                         <th>