diff --git a/external/nextcloud-notes b/external/nextcloud-notes
index e7e9ea03..aa547d01 160000
--- a/external/nextcloud-notes
+++ b/external/nextcloud-notes
@@ -1 +1 @@
-Subproject commit e7e9ea03c714198a7dada6494d51e77baa747812
+Subproject commit aa547d01617d5e0fb0a9a783714e3f9b9d73a430
diff --git a/external/openapi-generator b/external/openapi-generator
index 69f79fb7..9e412edb 160000
--- a/external/openapi-generator
+++ b/external/openapi-generator
@@ -1 +1 @@
-Subproject commit 69f79fb7892948590a9ffe46754c47ddd2634be1
+Subproject commit 9e412edb640a8e7e49db1ecc24958fdc9a50533e
diff --git a/external/seti-ui b/external/seti-ui
index 6b83574d..2d10473b 160000
--- a/external/seti-ui
+++ b/external/seti-ui
@@ -1 +1 @@
-Subproject commit 6b83574de165123583d6d8d5b3b6c91f04b7153d
+Subproject commit 2d10473b7575ec00c47eda751ea9caeec6b0b606
diff --git a/packages/file_icons/lib/src/data.dart b/packages/file_icons/lib/src/data.dart
index 5cc2a33e..2ef19c8e 100644
--- a/packages/file_icons/lib/src/data.dart
+++ b/packages/file_icons/lib/src/data.dart
@@ -243,6 +243,8 @@ const iconSetMap = {
   '.gitkeep': SetiMeta(_git, _ignore),
   '.gitattributes': SetiMeta(_git, _ignore),
   '.gitmodules': SetiMeta(_git, _ignore),
+  'commit_editmsg': SetiMeta(_git, _ignore),
+  'merge_msg': SetiMeta(_git, _ignore),
   '.go': SetiMeta(_go2, _blue),
   '.slide': SetiMeta(_go, _blue),
   '.article': SetiMeta(_go, _blue),
@@ -381,6 +383,7 @@ const iconSetMap = {
   '.tf': SetiMeta(_terraform, _purple),
   '.tf.json': SetiMeta(_terraform, _purple),
   '.tfvars': SetiMeta(_terraform, _purple),
+  '.tfvars.json': SetiMeta(_terraform, _purple),
   '.tex': SetiMeta(_tex, _blue),
   '.sty': SetiMeta(_tex, _yellow),
   '.dtx': SetiMeta(_tex, _orange),
diff --git a/packages/harbour/assets/logo_harbour.svg b/packages/harbour/assets/logo_harbour.svg
index 851dc1df..8aefa73c 100644
--- a/packages/harbour/assets/logo_harbour.svg
+++ b/packages/harbour/assets/logo_harbour.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-ferry" width="24" height="24" viewBox="0 0 24 24"><path fill="#f37736" d="M6,6H18V9.96L12,8L6,9.96M3.94,19H4C5.6,19 7,18.12 8,17C9,18.12 10.4,19 12,19C13.6,19 15,18.12 16,17C17,18.12 18.4,19 20,19H20.05L21.95,12.31C22.03,12.06 22,11.78 21.89,11.54C21.76,11.3 21.55,11.12 21.29,11.04L20,10.62V6C20,4.89 19.1,4 18,4H15V1H9V4H6A2,2 0 0,0 4,6V10.62L2.71,11.04C2.45,11.12 2.24,11.3 2.11,11.54C2,11.78 1.97,12.06 2.05,12.31M20,21C18.61,21 17.22,20.53 16,19.67C13.56,21.38 10.44,21.38 8,19.67C6.78,20.53 5.39,21 4,21H2V23H4C5.37,23 6.74,22.65 8,22C10.5,23.3 13.5,23.3 16,22C17.26,22.65 18.62,23 20,23H22V21H20Z" /></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="mdi-ferry" width="24" height="24" viewBox="0 0 24 24"><path fill="#f37736" d="M6,6H18V9.96L12,8L6,9.96M3.94,19H4C5.6,19 7,18.12 8,17C9,18.12 10.4,19 12,19C13.6,19 15,18.12 16,17C17,18.12 18.4,19 20,19H20.05L21.95,12.31C22.03,12.06 22,11.78 21.89,11.54C21.76,11.3 21.55,11.12 21.29,11.04L20,10.62V6C20,4.89 19.1,4 18,4H15V1H9V4H6A2,2 0 0,0 4,6V10.62L2.71,11.04C2.45,11.12 2.24,11.3 2.11,11.54C2,11.78 1.97,12.06 2.05,12.31M20,21C18.61,21 17.22,20.53 16,19.67C13.56,21.38 10.44,21.38 8,19.67C6.78,20.53 5.39,21 4,21H2V23H4C5.37,23 6.74,22.65 8,22C10.5,23.3 13.5,23.3 16,22C17.26,22.65 18.62,23 20,23H22V21H20Z" /></svg>