diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index faa22599f..4fcb62a87 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -3,9 +3,6 @@ name: Run tests and package firmware
 on:
   push:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     tags:
       - v*
@@ -20,11 +17,9 @@ on:
       - 'companion/**'
       - '.gitpod.yml'
       - '.devcontainer/**'
+      - 'fw.json'
   pull_request:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     paths-ignore:
       - '**.md'
@@ -37,6 +32,7 @@ on:
       - 'companion/**'
       - '.gitpod.yml'
       - '.devcontainer/**'
+      - 'fw.json'
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/linux_cpn.yml b/.github/workflows/linux_cpn.yml
index 01dc644e1..d0d92c1f3 100644
--- a/.github/workflows/linux_cpn.yml
+++ b/.github/workflows/linux_cpn.yml
@@ -3,9 +3,6 @@ name: Linux Companion
 on:
   push:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     tags:
       - v*
@@ -16,9 +13,6 @@ on:
 
   pull_request:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     paths:
       - '.github/workflows/linux_cpn.yml'
diff --git a/.github/workflows/macosx_cpn.yml b/.github/workflows/macosx_cpn.yml
index 78227d656..4b651d898 100644
--- a/.github/workflows/macosx_cpn.yml
+++ b/.github/workflows/macosx_cpn.yml
@@ -3,9 +3,6 @@ name: MacOSX Companion
 on:
   push:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     tags:
       - v*
@@ -16,9 +13,6 @@ on:
 
   pull_request:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     paths:
       - '.github/workflows/macosx_cpn.yml'
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ed3eb6c1e..009f21473 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,9 +1,6 @@
 ---
 name: Build and deploy nightly release
 on:
-  push:
-    branches:
-    - 'nightly_filenames'
   schedule:
     - cron: '0 2 * * *' # run at 2 AM UTC
 
diff --git a/.github/workflows/win_cpn-64.yml b/.github/workflows/win_cpn-64.yml
index 8287e4509..c96baec70 100644
--- a/.github/workflows/win_cpn-64.yml
+++ b/.github/workflows/win_cpn-64.yml
@@ -3,9 +3,6 @@ name: Windows Companion 64-bit
 on:
   push:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     tags:
       - v*
@@ -16,9 +13,6 @@ on:
 
   pull_request:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     paths:
       - '.github/workflows/win_cpn-64.yml'
diff --git a/radio/src/thirdparty/libopenui/thirdparty/lvgl b/radio/src/thirdparty/libopenui/thirdparty/lvgl
index 48cf9ec14..9a414b1d4 160000
--- a/radio/src/thirdparty/libopenui/thirdparty/lvgl
+++ b/radio/src/thirdparty/libopenui/thirdparty/lvgl
@@ -1 +1 @@
-Subproject commit 48cf9ec1406ed3bce8a2a4bdbd84678df3503988
+Subproject commit 9a414b1d48d2893133b6038ec80d59fb157aade4