diff --git a/package-lock.json b/package-lock.json
index 07351d91f..177c5223a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@intechstudio/grid-protocol": "1.20260302.1321",
-        "@intechstudio/grid-uikit": "1.20260303.1559",
+        "@intechstudio/grid-uikit": "^1.20260421.817",
         "@intechstudio/profile-cloud-webcomponent": "1.20251107.1414",
         "adm-zip": "^0.5.10",
         "axios": "^1.15.0",
@@ -2110,9 +2110,9 @@
       }
     },
     "node_modules/@intechstudio/grid-uikit": {
-      "version": "1.20260303.1559",
-      "resolved": "https://registry.npmjs.org/@intechstudio/grid-uikit/-/grid-uikit-1.20260303.1559.tgz",
-      "integrity": "sha512-OE4gYErV6a5NCyjRpnX7Nn0tyTmwhui+NT/LzbofaVwmLrWP/VpqXMHWWmW+QSqOmIPIyFUD53ZpQLS7zm83fw==",
+      "version": "1.20260421.817",
+      "resolved": "https://registry.npmjs.org/@intechstudio/grid-uikit/-/grid-uikit-1.20260421.817.tgz",
+      "integrity": "sha512-qbg5S5Z+tSaYpWc6EIjkL3Lt3Kh26M0zs+b2v6uduzym/G38NNOwJXntOFA2+NIrSwDsUciEKExnfXONNEHogA==",
       "dependencies": {
         "@melt-ui/svelte": "^0.86.6",
         "color-convert": "^2.0.1",
diff --git a/package.json b/package.json
index ba7a9afac..873cb0401 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@intechstudio/grid-protocol": "1.20260302.1321",
-    "@intechstudio/grid-uikit": "1.20260303.1559",
+    "@intechstudio/grid-uikit": "^1.20260421.817",
     "@intechstudio/profile-cloud-webcomponent": "1.20251107.1414",
     "adm-zip": "^0.5.10",
     "axios": "^1.15.0",
diff --git a/src/renderer/config-blocks/ActionBlockInformation.ts b/src/renderer/config-blocks/ActionBlockInformation.ts
index 536b9879c..6a820603c 100644
--- a/src/renderer/config-blocks/ActionBlockInformation.ts
+++ b/src/renderer/config-blocks/ActionBlockInformation.ts
@@ -33,6 +33,7 @@ interface Information {
     | "code"
     | "timer"
     | "function"
+    | "deprecated"
     | null;
   displayName: string;
   defaultLua: string;
diff --git a/src/renderer/config-blocks/Midi.svelte b/src/renderer/config-blocks/Midi.svelte
index 240187880..252785c6a 100644
--- a/src/renderer/config-blocks/Midi.svelte
+++ b/src/renderer/config-blocks/Midi.svelte
@@ -45,15 +45,21 @@
 </script>
 
 <script lang="ts">
-  import { createEventDispatcher } from "svelte";
-  import { MeltCombo } from "@intechstudio/grid-uikit";
+  import { createEventDispatcher, onMount } from "svelte";
+  import {
+    Block,
+    BlockRow,
+    BlockTitle,
+    MeltCombo,
+    MeltCheckbox,
+    MeltRadio,
+  } from "@intechstudio/grid-uikit";
   import { GridScript } from "@intechstudio/grid-protocol";
   import { midiCC } from "./_midi.js";
-  import { Script } from "./_script_parsers.js";
+  import { Script, extractParam } from "./_script_parsers.js";
   import { LocalDefinitions } from "../runtime/runtime.store";
   import { ActionData, GridAction, GridEvent } from "./../runtime/runtime";
   import SendFeedback from "../main/user-interface/SendFeedback.svelte";
-  import TabButton from "../main/user-interface/TabButton.svelte";
   import { MusicalNotes } from "../main/panels/MidiMonitor/MidiMonitor.store";
   import { Validator } from "./validators";
   import { Grid } from "../lib/_utils.js";
@@ -61,73 +67,132 @@
   export let action: GridAction;
 
   let event = action.parent as GridEvent;
+  let containerWidth = 0;
+  $: isWide = containerWidth > 360;
 
   const dispatch = createEventDispatcher();
 
+  let mounted = false;
+  onMount(() => {
+    mounted = true;
+  });
+
   const parameterNames = ["Channel", "Command", "Parameter 1", "Parameter 2"];
+  const luaValidator = (e: string) => new Validator(e).isLuaValue().Result();
+
   const validators = [
-    {
-      value: true,
-      func: (e: string) => {
-        return new Validator(e).isLuaValue().Result();
-      },
-    },
-    {
-      value: true,
-      func: (e: string) => {
-        return new Validator(e).isLuaValue().Result();
-      },
-    },
-    {
-      value: true,
-      func: (e: string) => {
-        return new Validator(e).isLuaValue().Result();
-      },
-    },
-    {
-      value: true,
-      func: (e: string) => {
-        return new Validator(e).isLuaValue().Result();
-      },
-    },
+    { value: true, func: luaValidator }, // channel
+    { value: true, func: luaValidator }, // command
+    { value: true, func: luaValidator }, // p1
+    { value: true, func: luaValidator }, // p2
+    { value: true, func: luaValidator }, // nrpn msb
+    { value: true, func: luaValidator }, // nrpn lsb
   ];
 
   let scriptSegments = [];
+  let feature1: boolean = false;
+  let feature2: boolean = false;
+  let mode: number = 0;
+  let nrpnMSB: string = "";
+  let nrpnLSB: string = "";
+
+  const modes = [
+    { title: "Default 7-bit", value: 0 },
+    { title: "CC 14-bit", value: 1 },
+    { title: "NRPN", value: 2 },
+    { title: "NRPN 14-bit", value: 3 },
+  ];
 
   $: if (!$action.invalid) {
     handleActionChange($action);
   }
 
   function handleActionChange(data: ActionData) {
-    scriptSegments = Script.toSegments({
+    const gmsContent = extractParam(data.script, "gms");
+    const allSegments = Script.toSegments({
       short: data.short,
-      script: data.script,
+      script: gmsContent !== null ? `gms(${gmsContent})` : data.script,
     });
+
+    scriptSegments = allSegments.slice(0, 4);
+    const modeSegment = allSegments[4];
+    mode = modeSegment !== undefined ? parseInt(modeSegment) || 0 : 0;
+
+    if (mode === 2 || mode === 3) {
+      const cc = scriptSegments[2];
+      if (cc !== calculateNRPNCC(nrpnMSB, nrpnLSB)) {
+        nrpnMSB = `(${cc})//128`;
+        nrpnLSB = `(${cc})%128`;
+      }
+    }
+
+    const rxParams = extractParam(data.script, "gmrr");
+    if (rxParams !== null) {
+      const match = rxParams.match(/\{(true|false),(true|false)\}/);
+      feature1 = match ? match[1] === "true" : false;
+      feature2 = match ? match[2] === "true" : false;
+    } else {
+      feature1 = false;
+      feature2 = false;
+    }
   }
 
   function sendData() {
+    const params = [...scriptSegments];
+    if (mode !== 0) {
+      params[1] = "176";
+      params.push(String(mode));
+    }
     const script = Script.toScript({
       short: action.short,
-      array: scriptSegments,
+      array: params,
     }); // important to set the function name
+    let fullScript = "self:" + script;
+    if (feature1 || feature2) {
+      const f1 = feature1 ? "true" : "false";
+      const f2 = feature2 ? "true" : "false";
+      fullScript += ` self:gmrr(-1,${scriptSegments[0]},${scriptSegments[1]},${scriptSegments[2]},{${f1},${f2}},${String(mode)})`;
+    }
     dispatch("update-action", {
       short: action.short,
-      script: "self:" + script,
+      script: fullScript,
       validationError: validators.some((e) => e.value === false),
     });
   }
 
+  function calculateNRPNCC(msb: string, lsb: string): string {
+    if (
+      msb.endsWith("//128") &&
+      lsb.endsWith("%128") &&
+      msb.slice(0, -5) === lsb.slice(0, -4)
+    ) {
+      let cc = msb.slice(0, -5);
+      if (cc.startsWith("(") && cc.endsWith(")")) cc = cc.slice(1, -1);
+      return cc;
+    }
+    return `(${msb})*128+${lsb}`;
+  }
+
+  $: handleFeatureChange(feature1, feature2);
+
+  function handleFeatureChange(_f1: boolean, _f2: boolean) {
+    if (!mounted) return;
+    sendData();
+    dispatch("sync");
+  }
+
+  $: handleModeChange(mode);
+
+  function handleModeChange(_mode: number) {
+    if (!mounted) return;
+    sendData();
+    dispatch("sync");
+  }
+
   $: if ($event) {
     renderSuggestions();
   }
 
-  const tabs = [
-    { name: "MIDI", short: "gms" },
-    { name: "14 bit MIDI", short: "gmsh" },
-    { name: "SysEX", short: "gmss" },
-    { name: "NRPN MIDI", short: "gmnp" },
-  ];
-
   type SuggestionValue = { value: string; info: string; key: string };
 
   // --- helpers ---
@@ -151,6 +216,11 @@
       key: `cc_${value}`,
     }));
 
+  const make14BitCCs = () =>
+    Object.entries(midiCC)
+      .filter(([value]) => Number(value) <= 31)
+      .map(([value, info]) => ({ value, info, key: `cc_${value}` }));
+
   const makeNotes = () =>
     Array.from({ length: 128 }, (_, i) => ({
       value: String(i),
@@ -197,27 +267,38 @@
         (s) => s.value == scriptSegments[1],
       )?.key ?? "control_change_messages";
 
-    // param1 depends on selected command
+    // param1 depends on mode and selected command
     let param1: SuggestionValue[];
-    switch (selectedCommand) {
-      case "control_change_messages":
-        param1 = [
-          makeAuto(
-            `Auto (${Grid.Auto.getMidi(action, Grid.Auto.Value.MIDI_P1)})`,
-          ),
-          ...makeCCs(),
-        ];
-        break;
-      case "note_on_event":
-      case "note_off_event":
-        const autoNote = Grid.Auto.getMidi(action, Grid.Auto.Value.MIDI_P1);
-        param1 = [
-          makeAuto(`Auto (${MusicalNotes.FromInt(autoNote)})`),
-          ...makeNotes(),
-        ];
-        break;
-      default:
-        param1 = [];
+    if (mode === 2 || mode === 3) {
+      param1 = [];
+    } else if (mode === 1) {
+      param1 = [
+        makeAuto(
+          `Auto (${Grid.Auto.getMidi(action, Grid.Auto.Value.MIDI_P1) % 32})`,
+        ),
+        ...make14BitCCs(),
+      ];
+    } else {
+      switch (selectedCommand) {
+        case "control_change_messages":
+          param1 = [
+            makeAuto(
+              `Auto (${Grid.Auto.getMidi(action, Grid.Auto.Value.MIDI_P1)})`,
+            ),
+            ...makeCCs(),
+          ];
+          break;
+        case "note_on_event":
+        case "note_off_event":
+          const autoNote = Grid.Auto.getMidi(action, Grid.Auto.Value.MIDI_P1);
+          param1 = [
+            makeAuto(`Auto (${MusicalNotes.FromInt(autoNote)})`),
+            ...makeNotes(),
+          ];
+          break;
+        default:
+          param1 = [];
+      }
     }
 
     // fetch local definitions
@@ -247,48 +328,174 @@
     ];
   }
 
-  $: if ($event) {
+  $: if ($event || mode !== undefined) {
     renderSuggestions();
   }
-
-  function handleTabButtonClicked(element) {
-    dispatch("replace", { short: element.short });
-  }
 </script>
 
-<action-midi class="flex flex-col w-full pb-2 px-2 pointer-events-auto">
-  {#if tabs !== undefined}
-    <div class="ml-auto flex flex-row mb-2">
-      <div />
-      {#each tabs as element}
-        <TabButton
-          selected={action.information.short == element.short}
-          text={element.name}
-          on:click={() => handleTabButtonClicked(element)}
+<action-midi
+  bind:clientWidth={containerWidth}
+  class="flex flex-col w-full pb-2 px-2 pointer-events-auto"
+>
+  <BlockRow>
+    <MeltRadio
+      options={modes}
+      bind:target={mode}
+      orientation={isWide ? "horizontal" : "vertical"}
+      style="button"
+      size={isWide ? "full" : "auto"}
+    />
+  </BlockRow>
+  <Block>
+    <BlockTitle>Send MIDI</BlockTitle>
+    <BlockRow even>
+      <MeltCombo
+        title={parameterNames[0]}
+        value={scriptSegments[0]}
+        suggestions={suggestions[0]}
+        validator={validators[0].func}
+        on:input={(e) => {
+          const { value, validationError } = e.detail;
+          scriptSegments[0] = value;
+          validators[0].value = !validationError;
+          sendData();
+        }}
+        on:change={() => dispatch("sync")}
+        postProcessor={GridScript.shortify}
+        preProcessor={GridScript.humanize}
+      />
+      {#if mode === 0}
+        <MeltCombo
+          title={parameterNames[1]}
+          value={scriptSegments[1]}
+          suggestions={suggestions[1]}
+          validator={validators[1].func}
+          on:input={(e) => {
+            const { value, validationError } = e.detail;
+            scriptSegments[1] = value;
+            validators[1].value = !validationError;
+            sendData();
+          }}
+          on:change={() => dispatch("sync")}
+          postProcessor={GridScript.shortify}
+          preProcessor={GridScript.humanize}
         />
-      {/each}
-    </div>
-  {/if}
-
-  <div class="w-full grid grid-flow-col auto-cols-fr gap-2">
-    {#each scriptSegments as script, i}
+      {/if}
+      {#if mode !== 2 && mode !== 3}
+        <MeltCombo
+          title={parameterNames[2]}
+          value={scriptSegments[2]}
+          suggestions={suggestions[2]}
+          validator={validators[2].func}
+          on:input={(e) => {
+            const { value, validationError } = e.detail;
+            scriptSegments[2] = value;
+            validators[2].value = !validationError;
+            sendData();
+          }}
+          on:change={() => dispatch("sync")}
+          postProcessor={GridScript.shortify}
+          preProcessor={GridScript.humanize}
+        />
+      {/if}
       <MeltCombo
-        title={parameterNames[i]}
-        value={script}
-        suggestions={suggestions[i]}
-        validator={validators[i].func}
+        title={parameterNames[3]}
+        value={scriptSegments[3]}
+        suggestions={suggestions[3]}
+        validator={validators[3].func}
         on:input={(e) => {
           const { value, validationError } = e.detail;
-          script = value;
-          validators[i].value = !validationError;
+          scriptSegments[3] = value;
+          validators[3].value = !validationError;
           sendData();
         }}
         on:change={() => dispatch("sync")}
         postProcessor={GridScript.shortify}
         preProcessor={GridScript.humanize}
       />
-    {/each}
-  </div>
+    </BlockRow>
+
+    {#if mode === 2 || mode === 3}
+      <BlockRow>
+        <div class="w-full grid grid-cols-[1fr_auto_1fr] items-center gap-2">
+          <div class="flex flex-col">
+            <MeltCombo
+              title="MSB"
+              value={nrpnMSB}
+              suggestions={suggestions[2]}
+              validator={validators[4].func}
+              on:input={(e) => {
+                const { value, validationError } = e.detail;
+                nrpnMSB = value;
+                validators[4].value = !validationError;
+                scriptSegments[2] = calculateNRPNCC(nrpnMSB, nrpnLSB);
+                sendData();
+              }}
+              on:change={() => dispatch("sync")}
+              postProcessor={GridScript.shortify}
+              preProcessor={GridScript.humanize}
+            />
+            <MeltCombo
+              title="LSB"
+              value={nrpnLSB}
+              suggestions={suggestions[2]}
+              validator={validators[5].func}
+              on:input={(e) => {
+                const { value, validationError } = e.detail;
+                nrpnLSB = value;
+                validators[5].value = !validationError;
+                scriptSegments[2] = calculateNRPNCC(nrpnMSB, nrpnLSB);
+                sendData();
+              }}
+              on:change={() => dispatch("sync")}
+              postProcessor={GridScript.shortify}
+              preProcessor={GridScript.humanize}
+            />
+          </div>
+          <div class="w-7 h-7 fill-white">
+            <svg
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 47.52 477.43 382.39"
+            >
+              <g
+                ><polygon
+                  points="101.82,187.52 57.673,143.372 476.213,143.372 476.213,113.372 57.181,113.372 101.82,68.733 80.607,47.519 0,128.126 80.607,208.733"
+                /><polygon
+                  points="396.82,268.694 375.607,289.907 420,334.301 1.213,334.301 1.213,364.301 420,364.301 375.607,408.694 396.82,429.907 477.427,349.301"
+                /></g
+              >
+            </svg>
+          </div>
+          <MeltCombo
+            title="NRPN CC"
+            value={scriptSegments[2]}
+            suggestions={suggestions[2]}
+            validator={validators[2].func}
+            on:input={(e) => {
+              const { value, validationError } = e.detail;
+              scriptSegments[2] = value;
+              validators[2].value = !validationError;
+              nrpnMSB = `(${value})//128`;
+              nrpnLSB = `(${value})%128`;
+              sendData();
+            }}
+            on:change={() => dispatch("sync")}
+            postProcessor={GridScript.shortify}
+            preProcessor={GridScript.humanize}
+          />
+        </div>
+      </BlockRow>
+    {/if}
+  </Block>
+
+  <Block>
+    <BlockTitle>Receive MIDI</BlockTitle>
+    <BlockRow>
+      <MeltCheckbox bind:target={feature1} title="Sync value" />
+      <MeltCheckbox bind:target={feature2} title="Sync LED intensity" />
+    </BlockRow>
+  </Block>
 
   <div class="mt-2">
     <SendFeedback feedback_context="Midi" />
diff --git a/src/renderer/config-blocks/MidiFourteenBit.svelte b/src/renderer/config-blocks/MidiFourteenBit.svelte
index a0395783c..161a3db3e 100644
--- a/src/renderer/config-blocks/MidiFourteenBit.svelte
+++ b/src/renderer/config-blocks/MidiFourteenBit.svelte
@@ -9,7 +9,7 @@
     short: "gmsh",
     name: "MidiFourteenBit",
     rendering: "standard",
-    category: "midi",
+    category: "deprecated",
     displayName: "MIDI 14",
     color: "#DA4167",
     defaultLua: "gms(0,176,0,val//128) gms(0,176,32,val%128)",
@@ -52,7 +52,7 @@
   import { LocalDefinitions } from "../runtime/runtime.store";
   import { ActionData, GridAction, GridEvent } from "./../runtime/runtime";
   import SendFeedback from "../main/user-interface/SendFeedback.svelte";
-  import TabButton from "../main/user-interface/TabButton.svelte";
+
   import { Script } from "./_script_parsers.js";
   import { Validator } from "./validators";
   import { Grid } from "../lib/_utils.js";
@@ -197,32 +197,12 @@
   $: if ($event) {
     renderSuggestions();
   }
-  const tabs = [
-    { name: "MIDI", short: "gms" },
-    { name: "14 bit MIDI", short: "gmsh" },
-    { name: "SysEX", short: "gmss" },
-    { name: "NRPN MIDI", short: "gmnp" },
-  ];
-
-  function handleTabButtonClicked(element) {
-    dispatch("replace", { short: element.short });
-  }
 </script>
 
 <action-midi class="flex flex-col w-full pb-2 px-2 pointer-events-auto">
-  {#if tabs !== undefined}
-    <div class="ml-auto flex flex-row mb-2">
-      <div />
-      {#each tabs as element}
-        <TabButton
-          selected={action.information.short == element.short}
-          text={element.name}
-          on:click={() => handleTabButtonClicked(element)}
-        />
-      {/each}
-    </div>
-  {/if}
-
+  <div class="w-full text-yellow-400 text-xs px-1 py-2">
+    This block is deprecated. Use the MIDI block with CC 14-bit mode instead.
+  </div>
   <div class="w-full grid grid-flow-col auto-cols-fr gap-2">
     {#each scriptSegments as script, i}
       <MeltCombo
diff --git a/src/renderer/config-blocks/MidiNRPN.svelte b/src/renderer/config-blocks/MidiNRPN.svelte
index 7efd158d9..d3bb7ab8f 100644
--- a/src/renderer/config-blocks/MidiNRPN.svelte
+++ b/src/renderer/config-blocks/MidiNRPN.svelte
@@ -8,7 +8,7 @@
     short: "gmnp",
     name: "MidiNRPN",
     rendering: "standard",
-    category: "midi",
+    category: "deprecated",
     displayName: "MIDI NRPN",
     color: "#DA4167",
     defaultLua: "gms(0,176,99,num//128) gms(0,176,98,num%128) gms(0,176,6,val)",
@@ -51,7 +51,7 @@
   import { LocalDefinitions } from "../runtime/runtime.store";
   import { ActionData, GridAction, GridEvent } from "./../runtime/runtime";
   import SendFeedback from "../main/user-interface/SendFeedback.svelte";
-  import TabButton from "../main/user-interface/TabButton.svelte";
+
   import { Script } from "./_script_parsers.js";
   import { Validator } from "./validators";
 
@@ -107,7 +107,7 @@
   function handleActionChange(data: ActionData) {
     // Extract all contents
     const matches = [];
-    const regex = /gms\((.*?[^)])\)(?=\s|$)/g;
+    const regex = /gms\((.*?[^)])\)(?=\s|gms|$)/g;
 
     let match;
     while ((match = regex.exec(data.script)) !== null) {
@@ -126,6 +126,8 @@
       }
     }
 
+    if (midiMSB.length < 2 || midiLSB.length < 1) return;
+
     value = midiMSB[1].split("//")[0];
     if (value.startsWith("(") && value.endsWith(")")) {
       value = value.slice(1, -1);
@@ -200,17 +202,6 @@
     renderSuggestions();
   }
 
-  const tabs = [
-    { name: "MIDI", short: "gms" },
-    { name: "14 bit MIDI", short: "gmsh" },
-    { name: "SysEX", short: "gmss" },
-    { name: "NRPN MIDI", short: "gmnp" },
-  ];
-
-  function handleTabButtonClicked(element) {
-    dispatch("replace", { short: element.short });
-  }
-
   function calculateNRPNCC(msb: string, lsb: string) {
     if (
       msb.endsWith("//128") &&
@@ -230,19 +221,9 @@
 </script>
 
 <action-midi class="flex flex-col w-full pb-2 px-2 pointer-events-auto">
-  {#if tabs !== undefined}
-    <div class="ml-auto flex flex-row mb-2">
-      <div />
-      {#each tabs as element}
-        <TabButton
-          selected={action.information.short == element.short}
-          text={element.name}
-          on:click={() => handleTabButtonClicked(element)}
-        />
-      {/each}
-    </div>
-  {/if}
-
+  <div class="w-full text-yellow-400 text-xs px-1 py-2">
+    This block is deprecated. Use the MIDI block with NRPN mode instead.
+  </div>
   <MeltCombo
     title={"Channel"}
     value={channel}
diff --git a/src/renderer/config-blocks/MidiSysEx.svelte b/src/renderer/config-blocks/MidiSysEx.svelte
index 53ba96ec2..9c218ed1b 100644
--- a/src/renderer/config-blocks/MidiSysEx.svelte
+++ b/src/renderer/config-blocks/MidiSysEx.svelte
@@ -48,7 +48,6 @@
   import { fly } from "svelte/transition";
   import { createEventDispatcher } from "svelte";
 
-  import TabButton from "../main/user-interface/TabButton.svelte";
   import SendFeedback from "../main/user-interface/SendFeedback.svelte";
   import { MoltenPushButton } from "@intechstudio/grid-uikit";
   import { ActionData, GridAction } from "../runtime/runtime.js";
@@ -86,33 +85,9 @@
     });
     dispatch("sync");
   }
-
-  const tabs = [
-    { name: "MIDI", short: "gms" },
-    { name: "14 bit MIDI", short: "gmsh" },
-    { name: "SysEX", short: "gmss" },
-    { name: "NRPN MIDI", short: "gmnp" },
-  ];
-
-  function handleTabButtonClicked(element) {
-    dispatch("replace", { short: element.short });
-  }
 </script>
 
 <action-midi class="flex flex-col w-full pb-2 px-2 pointer-events-auto">
-  {#if tabs !== undefined}
-    <div class="ml-auto flex flex-row mb-2">
-      <div />
-      {#each tabs as element}
-        <TabButton
-          selected={action.information.short == element.short}
-          text={element.name}
-          on:click={() => handleTabButtonClicked(element)}
-        />
-      {/each}
-    </div>
-  {/if}
-
   <div class="w-full flex flex-col">
     <div class="text-gray-500 text-sm pb-1 font-bold">
       Enter comma separated sysex bytes or variables.
diff --git a/src/renderer/config-blocks/SimpleColor.svelte b/src/renderer/config-blocks/SimpleColor.svelte
index dc3d81beb..a07a7c995 100644
--- a/src/renderer/config-blocks/SimpleColor.svelte
+++ b/src/renderer/config-blocks/SimpleColor.svelte
@@ -260,20 +260,22 @@
         postProcessor={GridScript.shortify}
         preProcessor={GridScript.humanize}
       />
-      <MeltSlider
-        target={$data.alphaSliderValue}
-        min={0}
-        max={1}
-        step={0.01}
-        on:change={(e) => {
-          const { value } = e.detail;
-          data.updateAlphaSliderValue(value);
-          sendData($data);
-        }}
-        on:commit={() => {
-          dispatch("sync");
-        }}
-      />
+      <Block>
+        <MeltSlider
+          target={$data.alphaSliderValue}
+          min={0}
+          max={1}
+          step={0.01}
+          on:change={(e) => {
+            const { value } = e.detail;
+            data.updateAlphaSliderValue(value);
+            sendData($data);
+          }}
+          on:commit={() => {
+            dispatch("sync");
+          }}
+        /></Block
+      >
     </BlockColumn>
   </BlockRow>
   <BlockRow>
diff --git a/src/renderer/main/RightPanelContainer.svelte b/src/renderer/main/RightPanelContainer.svelte
index eabd06aa2..6538c3f90 100644
--- a/src/renderer/main/RightPanelContainer.svelte
+++ b/src/renderer/main/RightPanelContainer.svelte
@@ -19,7 +19,7 @@
 <div class="w-full h-full" use:watchResize={resize}>
   <div
     style="background-color: var(--background); color: var(--foreground);"
-    class="h-full"
+    class="w-full h-full"
   >
     <Configuration />
   </div>
diff --git a/src/renderer/main/_actions/move.action.ts b/src/renderer/main/_actions/move.action.ts
index 4255b3122..1f1dfcdf8 100644
--- a/src/renderer/main/_actions/move.action.ts
+++ b/src/renderer/main/_actions/move.action.ts
@@ -118,6 +118,12 @@ export function draggable(node: HTMLElement, params: DragParameters) {
       return;
     }
 
+    // Scrollbars are not DOM elements; the node itself is the event target.
+    // Bail out if the click lands in the scrollbar region (beyond client area).
+    if (e.offsetX > node.clientWidth || e.offsetY > node.clientHeight) {
+      return;
+    }
+
     if (!movable) {
       return;
     }
diff --git a/src/renderer/main/panels/configuration/ActionList.svelte b/src/renderer/main/panels/configuration/ActionList.svelte
index 044afb148..e30249633 100644
--- a/src/renderer/main/panels/configuration/ActionList.svelte
+++ b/src/renderer/main/panels/configuration/ActionList.svelte
@@ -145,7 +145,7 @@
           return dragged && dragged.length > 0;
         },
       }}
-      class="overflow-y-scroll justify-start w-full h-full pl-2 pr-3"
+      class="overflow-y-scroll overflow-x-hidden justify-start w-full h-full pl-2 pr-3"
     >
       {#if $event?.config.length === 0 && $draggedActions.length === 0 && $profileCloudConfigDrag?.configType !== "snippet"}
         <SeparatorLine target={{ event: event, index: 0 }} />
diff --git a/src/renderer/main/panels/configuration/components/ActionPicker.svelte b/src/renderer/main/panels/configuration/components/ActionPicker.svelte
index f2f1f36ab..ab62e4112 100644
--- a/src/renderer/main/panels/configuration/components/ActionPicker.svelte
+++ b/src/renderer/main/panels/configuration/components/ActionPicker.svelte
@@ -226,7 +226,11 @@
     }
 
     if (get(appSettings).persistent.userLevelMinimalist === true) {
-      comp = comp.filter((e) => !e.information.hiddenInMinimalist);
+      comp = comp.filter(
+        (e) =>
+          !e.information.hiddenInMinimalist &&
+          e.information.category !== "deprecated",
+      );
     }
 
     //Group components by category
@@ -252,6 +256,7 @@
       "special",
       "code",
       "timer",
+      "deprecated",
     ];
     comp.sort(function (a, b) {
       return (
diff --git a/src/renderer/main/panels/configuration/components/DynamicWrapper.svelte b/src/renderer/main/panels/configuration/components/DynamicWrapper.svelte
index 70ae1af3e..c9b7f6bef 100644
--- a/src/renderer/main/panels/configuration/components/DynamicWrapper.svelte
+++ b/src/renderer/main/panels/configuration/components/DynamicWrapper.svelte
@@ -230,7 +230,7 @@
       }
     }
   }}
-  class="dynamicWrapper activator-button flex flex-grow outline-none"
+  class="dynamicWrapper activator-button flex flex-grow min-w-0 outline-none"
   class:cursor-pointer={ctrlIsDown}
 >
   <Indentation level={$action?.indentation ?? 0} />
@@ -238,7 +238,7 @@
   <!-- svelte-ignore a11y-no-static-element-interactions -->
   <carousel
     id="cfg-{index}"
-    class="flex flex-grow h-auto min-h-[32px] {!$action.isValid()
+    class="flex flex-grow min-w-0 overflow-x-auto h-auto min-h-[32px] {!$action.isValid()
       ? 'border border-error'
       : 'border border-background-soft'} cursor-pointer"
     class:rounded-tr-xl={$action.information.rounding === "top"}
@@ -285,14 +285,14 @@
 
       <!-- Body of the config block -->
       <div
-        class="w-full flex flex-grow items-center"
+        class="w-full flex flex-grow min-w-0 items-center"
         class:cursor-auto={$action.toggled}
         class:bg-opacity-30={$action.toggled}
       >
         <!-- Content of block -->
         {#if ($action.toggled && $action.information.toggleable) || typeof header === "undefined"}
           <!-- Body of the Action block when toggled -->
-          <div class="h-full w-full bg-background-mute">
+          <div class="h-full w-full bg-background-mute pointer-events-auto">
             <svelte:component
               this={component}
               {...componentProps}
diff --git a/src/renderer/main/panels/profileCloud/ProfileCloud.ts b/src/renderer/main/panels/profileCloud/ProfileCloud.ts
index bbc7e0bdc..2865e9335 100644
--- a/src/renderer/main/panels/profileCloud/ProfileCloud.ts
+++ b/src/renderer/main/panels/profileCloud/ProfileCloud.ts
@@ -88,6 +88,10 @@ export class ProfileCloudEvent {
                   .findEvent(target.event.value);
 
                 const snippet = GridSnippetData.createFromCloudData(config);
+                console.log(
+                  "[ProfileCloud] snippet lua:",
+                  snippet.actions.map((a) => a.toLua()).join(""),
+                );
                 loadSnippet(snippet, event, target.index).catch();
 
                 break;
diff --git a/src/renderer/runtime/runtime.ts b/src/renderer/runtime/runtime.ts
index 03a3eae9a..6a046f6a5 100644
--- a/src/renderer/runtime/runtime.ts
+++ b/src/renderer/runtime/runtime.ts
@@ -386,6 +386,12 @@ export class GridAction extends RuntimeNode<ActionData> {
 
     let actionString = script.replace(/\s{2,10}/g, " ");
 
+    // Strip legacy <?lua ... ?> framing from old cloud data
+    const framingMatch = actionString.match(/^<\?lua\s(.*)\s\?>$/s);
+    if (framingMatch) {
+      actionString = framingMatch[1];
+    }
+
     const matches = [
       ...actionString.matchAll(/--\[\[@(.*?)\]\]\s*(.*?)(?=(--\[\[@|$))/gs),
     ];