diff --git a/build.zig.zon b/build.zig.zon
index 4ef5de2..fd5e775 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -22,8 +22,8 @@
             .hash = "1220bbfd147f41fa49d2e5406096f3529c62e9335f4d2a89ae381e679a76ce398f1f",
         },
         .themes = .{
-            .url = "https://github.com/neurocyte/flow-themes/releases/download/master-8b79cf6d79373c142393ec26a81b19f4701f4372/flow-themes.tar.gz",
-            .hash = "1220e4f3baf09dc23e48616f7dbf00bd45c3034faa2eddede7bb45ef4c23a19b962b",
+            .url = "https://github.com/neurocyte/flow-themes/releases/download/master-618a7801d3383049adfe18cc09f5f5086c66995f/flow-themes.tar.gz",
+            .hash = "1220019ed92f48fb94d4ae82bba17b11d0ba06f17ed31cd66613b3c048b1d2382095",
         },
         .fuzzig = .{
             .url = "https://github.com/fjebaker/fuzzig/archive/0fd156d5097365151e85a85eef9d8cf0eebe7b00.tar.gz",
@@ -34,8 +34,8 @@
             .hash = "12207e33747072d878fce61f587c133124dc95f4ae8aab7d2b3f467699586af07c77",
         },
         .zeit = .{
-            .url = "https://github.com/rockorager/zeit/archive/9cca8ec620a54c3b07cd249f25e5bcb3153d03d7.tar.gz",
-            .hash = "1220755ea2a5aa6bb3713437aaafefd44812169fe43f1da755c3ee6101b85940f441",
+            .url = "https://github.com/rockorager/zeit/archive/8fd203f85f597f16e0a525c1f1ca1e0bffded809.tar.gz",
+            .hash = "122022233835adc719535a8e7cefdd2902a67bbfb7ef198441ca9ce89c0593f488c2",
         },
         .win32 = .{
             .url = "https://github.com/marlersoft/zigwin32/archive/259b6f353a48968d7e3171573db4fd898b046188.tar.gz",
diff --git a/src/syntax/src/file_types.zig b/src/syntax/src/file_types.zig
index a581f5b..a634930 100644
--- a/src/syntax/src/file_types.zig
+++ b/src/syntax/src/file_types.zig
@@ -80,7 +80,7 @@ pub const css = .{
 
 pub const diff = .{
     .description = "Diff",
-    .extensions = .{ "diff", "patch" },
+    .extensions = .{ "diff", "patch", "rej" },
     .comment = "#",
 };
 
diff --git a/src/tui/editor.zig b/src/tui/editor.zig
index 23f2442..92e3121 100644
--- a/src/tui/editor.zig
+++ b/src/tui/editor.zig
@@ -2466,8 +2466,14 @@ pub const Editor = struct {
             if (primary.selection) |_| {} else {
                 const sel = primary.enable_selection(root, self.metrics) catch return;
                 try move_cursor_begin(root, &sel.begin, self.metrics);
-                try move_cursor_end(root, &sel.end, self.metrics);
-                try move_cursor_right(root, &sel.end, self.metrics);
+                move_cursor_end(root, &sel.end, self.metrics) catch |e| switch (e) {
+                    error.Stop => {},
+                    else => return e,
+                };
+                move_cursor_right(root, &sel.end, self.metrics) catch |e| switch (e) {
+                    error.Stop => {},
+                    else => return e,
+                };
             };
         var first = true;
         var text = std.ArrayList(u8).init(self.allocator);