diff --git a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorHandler.cs b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorHandler.cs
index d2246bd..51246a7 100644
--- a/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorHandler.cs
+++ b/Xamarin.Neo4j/Xamarin.Neo4j/Xamarin.Neo4j.iOS/CustomRenderers/QueryEditorHandler.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using CoreGraphics;
 using Foundation;
+using Microsoft.Maui;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Platform;
@@ -22,6 +23,15 @@ namespace Xamarin.Neo4j.iOS.CustomRenderers
 {
     public class QueryEditorHandler : EditorHandler
     {
+        public QueryEditorHandler()
+        {
+            Mapper.AppendToMapping(nameof(Editor.Text), (handler, _) =>
+            {
+                if (handler is QueryEditorHandler qeh && handler.PlatformView is MauiTextView textView)
+                    HighlightWords(textView, qeh._keyWords);
+            });
+        }
+
         private readonly string[] _keyWords =
         [
             // Clauses
@@ -141,8 +151,6 @@ namespace Xamarin.Neo4j.iOS.CustomRenderers
                 AutoCapitalizeKeywords(platformView, _keyWords);
                 HighlightWords(platformView, _keyWords);
             };
-
-            HighlightWords(platformView, _keyWords);
         }
 
         private static void HighlightWords(UITextView platformView, IEnumerable<string> wordsToHighlight)
diff --git a/landing/public/demo.mp4 b/landing/public/demo.mp4
index 75f7578..62e0d3a 100644
Binary files a/landing/public/demo.mp4 and b/landing/public/demo.mp4 differ
diff --git a/landing/public/screenshot1.avif b/landing/public/screenshot1.avif
new file mode 100644
index 0000000..95dce42
Binary files /dev/null and b/landing/public/screenshot1.avif differ
diff --git a/landing/public/screenshot1.jpg b/landing/public/screenshot1.jpg
deleted file mode 100644
index 0d4350e..0000000
Binary files a/landing/public/screenshot1.jpg and /dev/null differ
diff --git a/landing/public/screenshot2.avif b/landing/public/screenshot2.avif
new file mode 100644
index 0000000..ecbe8ac
Binary files /dev/null and b/landing/public/screenshot2.avif differ
diff --git a/landing/public/screenshot2.jpg b/landing/public/screenshot2.jpg
deleted file mode 100644
index e743d4b..0000000
Binary files a/landing/public/screenshot2.jpg and /dev/null differ
diff --git a/landing/src/pages/index.astro b/landing/src/pages/index.astro
index f445326..d3e7df9 100644
--- a/landing/src/pages/index.astro
+++ b/landing/src/pages/index.astro
@@ -69,8 +69,8 @@ const APP_STORE_URL = "https://apps.apple.com/nl/app/pocketgraph/id1604368926";
 
     <div class="hero-visual">
       <div class="screenshots">
-        <img src="/screenshot1.jpg" alt="Graph visualization in PocketGraph" class="screenshot s1" />
-        <img src="/screenshot2.jpg" alt="Cypher editor in PocketGraph" class="screenshot s2" />
+        <img src="/screenshot1.avif" alt="Graph visualization in PocketGraph" class="screenshot s1" />
+        <img src="/screenshot2.avif" alt="Cypher editor in PocketGraph" class="screenshot s2" />
       </div>
     </div>
   </div>