34 changed files with 185 additions and 453 deletions
--- a/config.go
+++ b/config.go
@ -9,8 +9,6 @@ import (
 	"github.com/jetkvm/kvm/internal/logging"
 	"github.com/jetkvm/kvm/internal/network"
 	"github.com/jetkvm/kvm/internal/usbgadget"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
 )

 type WakeOnLanDevice struct {
@ -140,21 +138,6 @@ var (
 	configLock = &sync.Mutex{}
 )

-var (
-	configSuccess = promauto.NewGauge(
-		prometheus.GaugeOpts{
-			Name: "jetkvm_config_last_reload_successful",
-			Help: "The last configuration load succeeded",
-		},
-	)
-	configSuccessTime = promauto.NewGauge(
-		prometheus.GaugeOpts{
-			Name: "jetkvm_config_last_reload_success_timestamp_seconds",
-			Help: "Timestamp of last successful config load",
-		},
-	)
-)
-
 func LoadConfig() {
 	configLock.Lock()
 	defer configLock.Unlock()
@ -170,8 +153,6 @@ func LoadConfig() {
 	file, err := os.Open(configPath)
 	if err != nil {
 		logger.Debug().Msg("default config file doesn't exist, using default")
-		configSuccess.Set(1.0)
-		configSuccessTime.SetToCurrentTime()
 		return
 	}
 	defer file.Close()
@ -180,7 +161,6 @@ func LoadConfig() {
 	loadedConfig := *defaultConfig
 	if err := json.NewDecoder(file).Decode(&loadedConfig); err != nil {
 		logger.Warn().Err(err).Msg("config file JSON parsing failed")
-		configSuccess.Set(0.0)
 		return
 	}

@ -201,9 +181,6 @@ func LoadConfig() {

 	logging.GetRootLogger().UpdateLogLevel(config.DefaultLogLevel)

-	configSuccess.Set(1.0)
-	configSuccessTime.SetToCurrentTime()
-
 	logger.Info().Str("path", configPath).Msg("config loaded")
 }

--- a/dc_metrics.go
+++ b/dc_metrics.go
@ -1,53 +0,0 @@
-package kvm
-
-import (
-	"sync"
-
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-var (
-	dcCurrentGauge = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "jetkvm_dc_current_amperes",
-		Help: "Current DC power consumption in amperes",
-	})
-
-	dcPowerGauge = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "jetkvm_dc_power_watts",
-		Help: "DC power consumption in watts",
-	})
-
-	dcVoltageGauge = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "jetkvm_dc_voltage_volts",
-		Help: "DC voltage in volts",
-	})
-
-	dcStateGauge = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "jetkvm_dc_power_state",
-		Help: "DC power state (1 = on, 0 = off)",
-	})
-
-	dcMetricsRegistered sync.Once
-)
-
-// registerDCMetrics registers the DC power metrics with Prometheus (called once when DC control is mounted)
-func registerDCMetrics() {
-	dcMetricsRegistered.Do(func() {
-		prometheus.MustRegister(dcCurrentGauge)
-		prometheus.MustRegister(dcPowerGauge)
-		prometheus.MustRegister(dcVoltageGauge)
-		prometheus.MustRegister(dcStateGauge)
-	})
-}
-
-// updateDCMetrics updates the Prometheus metrics with current DC power state values
-func updateDCMetrics(state DCPowerState) {
-	dcCurrentGauge.Set(state.Current)
-	dcPowerGauge.Set(state.Power)
-	dcVoltageGauge.Set(state.Voltage)
-	if state.IsOn {
-		dcStateGauge.Set(1)
-	} else {
-		dcStateGauge.Set(0)
-	}
-}
--- a/dev_deploy.sh
+++ b/dev_deploy.sh
@ -28,7 +28,6 @@ show_help() {
    echo "      --run-go-tests         Run go tests"
    echo "      --run-go-tests-only    Run go tests and exit"
    echo "      --skip-ui-build        Skip frontend/UI build"
-    echo "  -i, --install              Build for release and install the app"
    echo "      --help                 Display this help message"
    echo
    echo "Example:"
@ -44,7 +43,6 @@ RESET_USB_HID_DEVICE=false
 LOG_TRACE_SCOPES="${LOG_TRACE_SCOPES:-jetkvm,cloud,websocket,native,jsonrpc}"
 RUN_GO_TESTS=false
 RUN_GO_TESTS_ONLY=false
-INSTALL_APP=false

 # Parse command line arguments
 while [[ $# -gt 0 ]]; do
@ -74,10 +72,6 @@ while [[ $# -gt 0 ]]; do
            RUN_GO_TESTS=true
            shift
            ;;
-        -i|--install)
-            INSTALL_APP=true
-            shift
-            ;;
        --help)
            show_help
            exit 0
@ -145,36 +139,25 @@ EOF
    fi
 fi

-if [ "$INSTALL_APP" = true ]
-then
-	msg_info "▶ Building release binary"
-	make build_release
-	
-	# Copy the binary to the remote host as if we were the OTA updater.
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "cat > /userdata/jetkvm/jetkvm_app.update" < bin/jetkvm_app
-	
-	# Reboot the device, the new app will be deployed by the startup process.
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "reboot"
-else
-	msg_info "▶ Building development binary"
-	make build_dev
-	
-	# Kill any existing instances of the application
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "killall jetkvm_app_debug || true"
-	
-	# Copy the binary to the remote host
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "cat > ${REMOTE_PATH}/jetkvm_app_debug" < bin/jetkvm_app
-	
-	if [ "$RESET_USB_HID_DEVICE" = true ]; then
-	msg_info "▶ Resetting USB HID device"
-	msg_warn "The option has been deprecated and will be removed in a future version, as JetKVM will now reset USB gadget configuration when needed"
-	# Remove the old USB gadget configuration
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "rm -rf /sys/kernel/config/usb_gadget/jetkvm/configs/c.1/hid.usb*"
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" "ls /sys/class/udc > /sys/kernel/config/usb_gadget/jetkvm/UDC"
-	fi
-	
-	# Deploy and run the application on the remote host
-	ssh "${REMOTE_USER}@${REMOTE_HOST}" ash << EOF
+msg_info "▶ Building go binary"
+make build_dev
+
+# Kill any existing instances of the application
+ssh "${REMOTE_USER}@${REMOTE_HOST}" "killall jetkvm_app_debug || true"
+
+# Copy the binary to the remote host
+ssh "${REMOTE_USER}@${REMOTE_HOST}" "cat > ${REMOTE_PATH}/jetkvm_app_debug" < bin/jetkvm_app
+
+if [ "$RESET_USB_HID_DEVICE" = true ]; then
+    msg_info "▶ Resetting USB HID device"
+    msg_warn "The option has been deprecated and will be removed in a future version, as JetKVM will now reset USB gadget configuration when needed"
+    # Remove the old USB gadget configuration
+    ssh "${REMOTE_USER}@${REMOTE_HOST}" "rm -rf /sys/kernel/config/usb_gadget/jetkvm/configs/c.1/hid.usb*"
+    ssh "${REMOTE_USER}@${REMOTE_HOST}" "ls /sys/class/udc > /sys/kernel/config/usb_gadget/jetkvm/UDC"
+fi
+
+# Deploy and run the application on the remote host
+ssh "${REMOTE_USER}@${REMOTE_HOST}" ash << EOF
 set -e

 # Set the library path to include the directory where librockit.so is located
@ -193,6 +176,5 @@ chmod +x jetkvm_app_debug
 # Run the application in the background
 PION_LOG_TRACE=${LOG_TRACE_SCOPES} ./jetkvm_app_debug | tee -a /tmp/jetkvm_app_debug.log
 EOF
-fi

-echo "Deployment complete."
+echo "Deployment complete."
--- a/internal/confparser/confparser.go
+++ b/internal/confparser/confparser.go
@ -3,7 +3,6 @@ package confparser
 import (
 	"fmt"
 	"net"
-	"net/url"
 	"reflect"
 	"slices"
 	"strconv"
@ -373,10 +372,6 @@ func (f *FieldConfig) validateField() error {
 			if _, err := idna.Lookup.ToASCII(val); err != nil {
 				return fmt.Errorf("field `%s` is not a valid hostname: %s", f.Name, val)
 			}
-		case "proxy":
-			if url, err := url.Parse(val); err != nil || (url.Scheme != "http" && url.Scheme != "https") || url.Host == "" {
-				return fmt.Errorf("field `%s` is not a valid HTTP proxy URL: %s", f.Name, val)
-			}
 		default:
 			return fmt.Errorf("field `%s` cannot use validate_type: unsupported validator: %s", f.Name, validateType)
 		}
--- a/internal/network/config.go
+++ b/internal/network/config.go
@ -3,8 +3,6 @@ package network
 import (
 	"fmt"
 	"net"
-	"net/http"
-	"net/url"
 	"time"

 	"github.com/guregu/null/v6"
@ -34,9 +32,8 @@ type IPv6StaticConfig struct {
 	DNS     []string    `json:"dns,omitempty" validate_type:"ipv6" required:"true"`
 }
 type NetworkConfig struct {
-	Hostname  null.String `json:"hostname,omitempty" validate_type:"hostname"`
-	HTTPProxy null.String `json:"http_proxy,omitempty" validate_type:"proxy"`
-	Domain    null.String `json:"domain,omitempty" validate_type:"hostname"`
+	Hostname null.String `json:"hostname,omitempty" validate_type:"hostname"`
+	Domain   null.String `json:"domain,omitempty" validate_type:"hostname"`

 	IPv4Mode   null.String       `json:"ipv4_mode,omitempty" one_of:"dhcp,static,disabled" default:"dhcp"`
 	IPv4Static *IPv4StaticConfig `json:"ipv4_static,omitempty" required_if:"IPv4Mode=static"`
@ -74,18 +71,6 @@ func (c *NetworkConfig) GetMDNSMode() *mdns.MDNSListenOptions {

 	return listenOptions
 }
-
-func (s *NetworkConfig) GetTransportProxyFunc() func(*http.Request) (*url.URL, error) {
-	return func(*http.Request) (*url.URL, error) {
-		if s.HTTPProxy.String == "" {
-			return nil, nil
-		} else {
-			proxyUrl, _ := url.Parse(s.HTTPProxy.String)
-			return proxyUrl, nil
-		}
-	}
-}
-
 func (s *NetworkInterfaceState) GetHostname() string {
 	hostname := ToValidHostname(s.config.Hostname.String)

--- a/internal/timesync/http.go
+++ b/internal/timesync/http.go
@ -5,7 +5,6 @@ import (
 	"errors"
 	"math/rand"
 	"net/http"
-	"net/url"
 	"strconv"
 	"time"
 )
@ -58,7 +57,6 @@ func (t *TimeSync) queryMultipleHttp(urls []string, timeout time.Duration) (now
 				ctx,
 				url,
 				timeout,
-				t.networkConfig.GetTransportProxyFunc(),
 			)
 			duration := time.Since(startTime)

@ -124,16 +122,10 @@ func queryHttpTime(
 	ctx context.Context,
 	url string,
 	timeout time.Duration,
-	proxyFunc func(*http.Request) (*url.URL, error),
 ) (now *time.Time, response *http.Response, err error) {
-	transport := http.DefaultTransport.(*http.Transport).Clone()
-	transport.Proxy = proxyFunc
-
 	client := http.Client{
-		Transport: transport,
-		Timeout:   timeout,
+		Timeout: timeout,
 	}
-
 	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
 	if err != nil {
 		return nil, nil, err
--- a/internal/usbgadget/hid_keyboard.go
+++ b/internal/usbgadget/hid_keyboard.go
@ -14,10 +14,9 @@ var keyboardConfig = gadgetConfigItem{
 	path:       []string{"functions", "hid.usb0"},
 	configPath: []string{"hid.usb0"},
 	attrs: gadgetAttributes{
-		"protocol":        "1",
-		"subclass":        "1",
-		"report_length":   "8",
-		"no_out_endpoint": "0",		
+		"protocol":      "1",
+		"subclass":      "1",
+		"report_length": "8",
 	},
 	reportDesc: keyboardReportDesc,
 }
--- a/internal/usbgadget/hid_mouse_absolute.go
+++ b/internal/usbgadget/hid_mouse_absolute.go
@ -11,10 +11,9 @@ var absoluteMouseConfig = gadgetConfigItem{
 	path:       []string{"functions", "hid.usb1"},
 	configPath: []string{"hid.usb1"},
 	attrs: gadgetAttributes{
-		"protocol":        "2",
-		"subclass":        "0",
-		"report_length":   "6",
-		"no_out_endpoint": "1",
+		"protocol":      "2",
+		"subclass":      "0",
+		"report_length": "6",
 	},
 	reportDesc: absoluteMouseCombinedReportDesc,
 }
--- a/internal/usbgadget/hid_mouse_relative.go
+++ b/internal/usbgadget/hid_mouse_relative.go
@ -11,10 +11,9 @@ var relativeMouseConfig = gadgetConfigItem{
 	path:       []string{"functions", "hid.usb2"},
 	configPath: []string{"hid.usb2"},
 	attrs: gadgetAttributes{
-		"protocol":        "2",
-		"subclass":        "1",
-		"report_length":   "4",
-		"no_out_endpoint": "1",
+		"protocol":      "2",
+		"subclass":      "1",
+		"report_length": "4",
 	},
 	reportDesc: relativeMouseCombinedReportDesc,
 }
--- a/ota.go
+++ b/ota.go
@ -93,14 +93,7 @@ func fetchUpdateMetadata(ctx context.Context, deviceId string, includePreRelease
 		return nil, fmt.Errorf("error creating request: %w", err)
 	}

-	transport := http.DefaultTransport.(*http.Transport).Clone()
-	transport.Proxy = config.NetworkConfig.GetTransportProxyFunc()
-
-	client := &http.Client{
-		Transport: transport,
-	}
-
-	resp, err := client.Do(req)
+	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("error sending request: %w", err)
 	}
@ -146,7 +139,6 @@ func downloadFile(ctx context.Context, path string, url string, downloadProgress
 	client := http.Client{
 		Timeout: 10 * time.Minute,
 		Transport: &http.Transport{
-			Proxy:               config.NetworkConfig.GetTransportProxyFunc(),
 			TLSHandshakeTimeout: 30 * time.Second,
 			TLSClientConfig: &tls.Config{
 				RootCAs: rootcerts.ServerCertPool(),
--- a/serial.go
+++ b/serial.go
@ -128,7 +128,6 @@ func pressATXResetButton(duration time.Duration) error {

 func mountDCControl() error {
 	_ = port.SetMode(defaultMode)
-	registerDCMetrics()
 	go runDCControl()
 	return nil
 }
@ -207,9 +206,6 @@ func runDCControl() {
 		dcState.Current = amps
 		dcState.Power = watts

-		// Update Prometheus metrics
-		updateDCMetrics(dcState)
-
 		if currentSession != nil {
 			writeJSONRPCEvent("dcState", dcState, currentSession)
 		}
--- a/ui/src/components/Terminal.tsx
+++ b/ui/src/components/Terminal.tsx
@ -67,19 +67,19 @@ function Terminal({
 }) {
  const enableTerminal = useUiStore(state => state.terminalType == type);
  const setTerminalType = useUiStore(state => state.setTerminalType);
-  const setDisableVideoFocusTrap = useUiStore(state => state.setDisableVideoFocusTrap);
+  const setDisableKeyboardFocusTrap = useUiStore(state => state.setDisableVideoFocusTrap);

  const { instance, ref } = useXTerm({ options: TERMINAL_CONFIG });

  useEffect(() => {
    setTimeout(() => {
-      setDisableVideoFocusTrap(enableTerminal);
+      setDisableKeyboardFocusTrap(enableTerminal);
    }, 500);

    return () => {
-      setDisableVideoFocusTrap(false);
+      setDisableKeyboardFocusTrap(false);
    };
-  }, [enableTerminal, setDisableVideoFocusTrap]);
+  }, [ref, instance, enableTerminal, setDisableKeyboardFocusTrap, type]);

  const readyState = dataChannel.readyState;
  useEffect(() => {
@ -116,7 +116,7 @@ function Terminal({
      const { domEvent } = e;
      if (domEvent.key === "Escape") {
        setTerminalType("none");
-        setDisableVideoFocusTrap(false);
+        setDisableKeyboardFocusTrap(false);
        domEvent.preventDefault();
      }
    });
@ -131,7 +131,7 @@ function Terminal({
      onDataHandler.dispose();
      onKeyHandler.dispose();
    };
-  }, [dataChannel, instance, readyState, setDisableVideoFocusTrap, setTerminalType]);
+  }, [instance, dataChannel, readyState, setDisableKeyboardFocusTrap, setTerminalType]);

  useEffect(() => {
    if (!instance) return;
@ -158,7 +158,7 @@ function Terminal({
    return () => {
      window.removeEventListener("resize", handleResize);
    };
-  }, [instance]);
+  }, [ref, instance]);

  return (
    <div
--- a/ui/src/components/popovers/PasteModal.tsx
+++ b/ui/src/components/popovers/PasteModal.tsx
@ -10,11 +10,11 @@ import { SettingsPageHeader } from "@components/SettingsPageheader";
 import { useJsonRpc } from "@/hooks/useJsonRpc";
 import { useHidStore, useRTCStore, useUiStore, useSettingsStore } from "@/hooks/stores";
 import { keys, modifiers } from "@/keyboardMappings";
-import { KeyStroke, KeyboardLayout, selectedKeyboard } from "@/keyboardLayouts";
+import { layouts, chars } from "@/keyboardLayouts";
 import notifications from "@/notifications";

-const hidKeyboardPayload = (modifier: number, keys: number[]) => {
-  return { modifier, keys };
+const hidKeyboardPayload = (keys: number[], modifier: number) => {
+  return { keys, modifier };
 };

 const modifierCode = (shift?: boolean, altRight?: boolean) => {
@ -62,56 +62,49 @@ export default function PasteModal() {
  const onConfirmPaste = useCallback(async () => {
    setPasteMode(false);
    setDisableVideoFocusTrap(false);
-
    if (rpcDataChannel?.readyState !== "open" || !TextAreaRef.current) return;
-    const keyboard: KeyboardLayout = selectedKeyboard(safeKeyboardLayout);
-    if (!keyboard) return;
-
+    if (!safeKeyboardLayout) return;
+    if (!chars[safeKeyboardLayout]) return;
    const text = TextAreaRef.current.value;

    try {
      for (const char of text) {
-        const keyprops = keyboard.chars[char];
-        if (!keyprops) continue;
-
-        const { key, shift, altRight, deadKey, accentKey } = keyprops;
+        const { key, shift, altRight, deadKey, accentKey } = chars[safeKeyboardLayout][char]
        if (!key) continue;

-        // if this is an accented character, we need to send that accent FIRST
-        if (accentKey) {
-          await sendKeystroke({modifier: modifierCode(accentKey.shift, accentKey.altRight), keys: [ keys[accentKey.key] ] })
-        }
+        const keyz = [ keys[key] ];
+        const modz = [ modifierCode(shift, altRight) ];

-        // now send the actual key
-        await sendKeystroke({ modifier: modifierCode(shift, altRight), keys: [ keys[key] ]});
-
-        // if what was requested was a dead key, we need to send an unmodified space to emit
-        // just the accent character
        if (deadKey) {
-           await sendKeystroke({ modifier: noModifier, keys: [ keys["Space"] ] });
+            keyz.push(keys["Space"]);
+            modz.push(noModifier);
+        }
+        if (accentKey) {
+            keyz.unshift(keys[accentKey.key])
+            modz.unshift(modifierCode(accentKey.shift, accentKey.altRight))
        }

-        // now send a message with no keys down to "release" the keys
-        await sendKeystroke({ modifier: 0, keys: [] });
+        for (const [index, kei] of keyz.entries()) {
+          await new Promise<void>((resolve, reject) => {
+            send(
+              "keyboardReport",
+              hidKeyboardPayload([kei], modz[index]),
+              params => {
+                if ("error" in params) return reject(params.error);
+                send("keyboardReport", hidKeyboardPayload([], 0), params => {
+                  if ("error" in params) return reject(params.error);
+                  resolve();
+                });
+              },
+            );
+          });
+        }
      }
    } catch (error) {
-      console.error("Failed to paste text:", error);
+      console.error(error);
      notifications.error("Failed to paste text");
    }
-
-    async function sendKeystroke(stroke: KeyStroke) {
-      await new Promise<void>((resolve, reject) => {
-        send(
-          "keyboardReport",
-          hidKeyboardPayload(stroke.modifier, stroke.keys),
-          params => {
-            if ("error" in params) return reject(params.error);
-            resolve();
-          }
-        );
-      });
-    }
-  }, [rpcDataChannel?.readyState, safeKeyboardLayout, send, setDisableVideoFocusTrap, setPasteMode]);
+  }, [rpcDataChannel?.readyState, send, setDisableVideoFocusTrap, setPasteMode, safeKeyboardLayout]);

  useEffect(() => {
    if (TextAreaRef.current) {
@ -161,7 +154,7 @@ export default function PasteModal() {
                            // @ts-expect-error TS doesn't recognize Intl.Segmenter in some environments
                            [...new Intl.Segmenter().segment(value)]
                              .map(x => x.segment)
-                              .filter(char => !selectedKeyboard(safeKeyboardLayout).chars[char]),
+                              .filter(char => !chars[safeKeyboardLayout][char]),
                          ),
                        ];

@ -182,7 +175,7 @@ export default function PasteModal() {
                </div>
                <div className="space-y-4">
                  <p className="text-xs text-slate-600 dark:text-slate-400">
-                    Sending text using keyboard layout: {selectedKeyboard(safeKeyboardLayout).name}
+                    Sending text using keyboard layout: {layouts[safeKeyboardLayout]}
                  </p>
                </div>
              </div>
--- a/ui/src/components/popovers/WakeOnLan/Index.tsx
+++ b/ui/src/components/popovers/WakeOnLan/Index.tsx
@ -14,7 +14,7 @@ import AddDeviceForm from "./AddDeviceForm";
 export default function WakeOnLanModal() {
  const [storedDevices, setStoredDevices] = useState<StoredDevice[]>([]);
  const [showAddForm, setShowAddForm] = useState(false);
-  const setDisableVideoFocusTrap = useUiStore(state => state.setDisableVideoFocusTrap);
+  const setDisableFocusTrap = useUiStore(state => state.setDisableVideoFocusTrap);

  const rpcDataChannel = useRTCStore(state => state.rpcDataChannel);

@ -24,9 +24,9 @@ export default function WakeOnLanModal() {
  const [addDeviceErrorMessage, setAddDeviceErrorMessage] = useState<string | null>(null);

  const onCancelWakeOnLanModal = useCallback(() => {
-    setDisableVideoFocusTrap(false);
    close();
-  }, [close, setDisableVideoFocusTrap]);
+    setDisableFocusTrap(false);
+  }, [close, setDisableFocusTrap]);

  const onSendMagicPacket = useCallback(
    (macAddress: string) => {
@ -43,12 +43,12 @@ export default function WakeOnLanModal() {
          }
        } else {
          notifications.success("Magic Packet sent successfully");
-          setDisableVideoFocusTrap(false);
+          setDisableFocusTrap(false);
          close();
        }
      });
    },
-    [close, rpcDataChannel?.readyState, send, setDisableVideoFocusTrap],
+    [close, rpcDataChannel?.readyState, send, setDisableFocusTrap],
  );

  const syncStoredDevices = useCallback(() => {
@ -78,7 +78,7 @@ export default function WakeOnLanModal() {
        }
      });
    },
-    [send, storedDevices, syncStoredDevices],
+    [storedDevices, send, syncStoredDevices],
  );

  const onAddDevice = useCallback(
--- a/ui/src/hooks/stores.ts
+++ b/ui/src/hooks/stores.ts
@ -747,7 +747,6 @@ export type TimeSyncMode =
 export interface NetworkSettings {
  hostname: string;
  domain: string;
-  http_proxy: string;
  ipv4_mode: IPv4Mode;
  ipv6_mode: IPv6Mode;
  lldp_mode: LLDPMode;
@ -936,5 +935,5 @@ export const useMacrosStore = create<MacrosState>((set, get) => ({
    } finally {
      set({ loading: false });
    }
-  }
+  },
 }));
--- a/ui/src/keyboardLayouts.ts
+++ b/ui/src/keyboardLayouts.ts
@ -1,32 +1,45 @@
-export interface KeyStroke { modifier: number; keys: number[]; }
-export interface KeyInfo { key: string | number; shift?: boolean, altRight?: boolean }
-export interface KeyCombo extends KeyInfo { deadKey?: boolean, accentKey?: KeyInfo }
-export interface KeyboardLayout { isoCode: string, name: string, chars: Record<string, KeyCombo> }
+import { chars as chars_fr_BE, name as name_fr_BE } from "@/keyboardLayouts/fr_BE"
+import { chars as chars_cs_CZ, name as name_cs_CZ } from "@/keyboardLayouts/cs_CZ"
+import { chars as chars_en_UK, name as name_en_UK } from "@/keyboardLayouts/en_UK"
+import { chars as chars_en_US, name as name_en_US } from "@/keyboardLayouts/en_US"
+import { chars as chars_fr_FR, name as name_fr_FR } from "@/keyboardLayouts/fr_FR"
+import { chars as chars_de_DE, name as name_de_DE } from "@/keyboardLayouts/de_DE"
+import { chars as chars_it_IT, name as name_it_IT } from "@/keyboardLayouts/it_IT"
+import { chars as chars_nb_NO, name as name_nb_NO } from "@/keyboardLayouts/nb_NO"
+import { chars as chars_es_ES, name as name_es_ES } from "@/keyboardLayouts/es_ES"
+import { chars as chars_sv_SE, name as name_sv_SE } from "@/keyboardLayouts/sv_SE"
+import { chars as chars_fr_CH, name as name_fr_CH } from "@/keyboardLayouts/fr_CH"
+import { chars as chars_de_CH, name as name_de_CH } from "@/keyboardLayouts/de_CH"

-// to add a new layout, create a file like the above and add it to the list
-import { cs_CZ } from "@/keyboardLayouts/cs_CZ"
-import { de_CH } from "@/keyboardLayouts/de_CH"
-import { de_DE } from "@/keyboardLayouts/de_DE"
-import { en_US } from "@/keyboardLayouts/en_US"
-import { en_UK } from "@/keyboardLayouts/en_UK"
-import { es_ES } from "@/keyboardLayouts/es_ES"
-import { fr_BE } from "@/keyboardLayouts/fr_BE"
-import { fr_CH } from "@/keyboardLayouts/fr_CH"
-import { fr_FR } from "@/keyboardLayouts/fr_FR"
-import { it_IT } from "@/keyboardLayouts/it_IT"
-import { nb_NO } from "@/keyboardLayouts/nb_NO"
-import { sv_SE } from "@/keyboardLayouts/sv_SE"
+interface KeyInfo { key: string | number; shift?: boolean, altRight?: boolean }
+export type KeyCombo = KeyInfo & { deadKey?: boolean, accentKey?: KeyInfo }

-export const keyboards: KeyboardLayout[] = [ cs_CZ, de_CH, de_DE, en_UK, en_US, es_ES, fr_BE, fr_CH, fr_FR, it_IT, nb_NO, sv_SE ];
-
-export const selectedKeyboard = (isoCode: string): KeyboardLayout => {
-  // fallback to original behaviour of en-US if no isoCode given
-  return keyboards.find(keyboard => keyboard.isoCode == isoCode) 
-        ?? keyboards.find(keyboard => keyboard.isoCode == "en-US")!;
-};
-
-export const keyboardOptions = () => {
-  return keyboards.map((keyboard) => {
-    return { label: keyboard.name, value: keyboard.isoCode }
-  });
+export const layouts: Record<string, string> = {
+  be_FR: name_fr_BE,
+  cs_CZ: name_cs_CZ,
+  en_UK: name_en_UK,
+  en_US: name_en_US,
+  fr_FR: name_fr_FR,
+  de_DE: name_de_DE,
+  it_IT: name_it_IT,
+  nb_NO: name_nb_NO,
+  es_ES: name_es_ES,
+  sv_SE: name_sv_SE,
+  fr_CH: name_fr_CH,
+  de_CH: name_de_CH,
 }
+
+export const chars: Record<string, Record<string, KeyCombo>> = {
+  be_FR: chars_fr_BE,
+  cs_CZ: chars_cs_CZ,
+  en_UK: chars_en_UK,
+  en_US: chars_en_US,
+  fr_FR: chars_fr_FR,
+  de_DE: chars_de_DE,
+  it_IT: chars_it_IT,
+  nb_NO: chars_nb_NO,
+  es_ES: chars_es_ES,
+  sv_SE: chars_sv_SE,
+  fr_CH: chars_fr_CH,
+  de_CH: chars_de_CH,
+};
--- a/ui/src/keyboardLayouts/cs_CZ.ts
+++ b/ui/src/keyboardLayouts/cs_CZ.ts
@ -1,6 +1,6 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-const name = "Čeština";
+export const name = "Čeština";

 const keyTrema = { key: "Backslash" } // tréma (umlaut), two dots placed above a vowel
 const keyAcute = { key: "Equal" } // accent aigu (acute accent), mark ´ placed above the letter
@ -13,7 +13,7 @@ const keyOverdot = { key: "Digit8", shift: true, altRight: true } // overdot (do
 const keyHook = { key: "Digit6", shift: true, altRight: true } // ogonoek (little hook), mark ˛ placed beneath a letter
 const keyCedille = { key: "Equal", shift: true, altRight: true } // accent cedille (cedilla), mark ¸ placed beneath a letter

-const chars = {
+export const chars = {
  A: { key: "KeyA", shift: true },
  "Ä": { key: "KeyA", shift: true, accentKey: keyTrema },
  "Á": { key: "KeyA", shift: true, accentKey: keyAcute },
@ -242,9 +242,3 @@ const chars = {
  Enter: { key: "Enter" },
  Tab: { key: "Tab" },
 } as Record<string, KeyCombo>;
-
-export const cs_CZ: KeyboardLayout = {
-  isoCode: "cs-CZ",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardLayouts/de_CH.ts
+++ b/ui/src/keyboardLayouts/de_CH.ts
@ -1,6 +1,6 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-const name = "Schwiizerdütsch";
+export const name = "Schwiizerdütsch";

 const keyTrema = { key: "BracketRight" } // tréma (umlaut), two dots placed above a vowel
 const keyAcute = { key: "Minus", altRight: true } // accent aigu (acute accent), mark ´ placed above the letter
@ -8,7 +8,7 @@ const keyHat = { key: "Equal" } // accent circonflexe (accent hat), mark ^ place
 const keyGrave = { key: "Equal", shift: true } // accent grave, mark ` placed above the letter
 const keyTilde = { key: "Equal", altRight: true } // tilde, mark ~ placed above the letter

-const chars = {
+export const chars = {
  A: { key: "KeyA", shift: true },
  "Ä": { key: "KeyA", shift: true, accentKey: keyTrema },
  "Á": { key: "KeyA", shift: true, accentKey: keyAcute },
@ -163,9 +163,3 @@ const chars = {
  Enter: { key: "Enter" },
  Tab: { key: "Tab" },
 } as Record<string, KeyCombo>;
-
-export const de_CH: KeyboardLayout = {
-  isoCode: "de-CH",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardLayouts/de_DE.ts
+++ b/ui/src/keyboardLayouts/de_DE.ts
@ -1,12 +1,12 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-const name = "Deutsch";
+export const name = "Deutsch";

 const keyAcute = { key: "Equal" } // accent aigu (acute accent), mark ´ placed above the letter
 const keyHat = { key: "Backquote" } // accent circonflexe (accent hat), mark ^ placed above the letter
 const keyGrave = { key: "Equal", shift: true } // accent grave, mark ` placed above the letter

-const chars = {
+export const chars = {
  A: { key: "KeyA", shift: true },
  "Á": { key: "KeyA", shift: true, accentKey: keyAcute },
  "Â": { key: "KeyA", shift: true, accentKey: keyHat },
@ -150,9 +150,3 @@ const chars = {
  Enter: { key: "Enter" },
  Tab: { key: "Tab" },
 } as Record<string, KeyCombo>;
-
-export const de_DE: KeyboardLayout = {
-  isoCode: "de-DE",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardLayouts/en_UK.ts
+++ b/ui/src/keyboardLayouts/en_UK.ts
@ -1,8 +1,8 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-const name = "English (UK)";
+export const name = "English (UK)";

-const chars = {
+export const chars = {
  A: { key: "KeyA", shift: true },
  B: { key: "KeyB", shift: true },
  C: { key: "KeyC", shift: true },
@ -105,9 +105,3 @@ const chars = {
  Enter: { key: "Enter" },
  Tab: { key: "Tab" },
 } as Record<string, KeyCombo>
-
-export const en_UK: KeyboardLayout = {
-  isoCode: "en-UK",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardLayouts/en_US.ts
+++ b/ui/src/keyboardLayouts/en_US.ts
@ -1,8 +1,8 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-const name = "English (US)";
+export const name = "English (US)";

-const chars = {
+export const chars = {
  A: { key: "KeyA", shift: true },
  B: { key: "KeyB", shift: true },
  C: { key: "KeyC", shift: true },
@ -111,9 +111,3 @@ const chars = {
  Insert: { key: "Insert", shift: false },
  Delete: { key: "Delete", shift: false },
 } as Record<string, KeyCombo>
-
-export const en_US: KeyboardLayout = {
-  isoCode: "en-US",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardLayouts/es_ES.ts
+++ b/ui/src/keyboardLayouts/es_ES.ts
@ -1,6 +1,6 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-const name = "Español";
+export const name = "Español";

 const keyTrema = { key: "Quote", shift: true } // tréma (umlaut), two dots placed above a vowel
 const keyAcute = { key: "Quote" } // accent aigu (acute accent), mark ´ placed above the letter
@ -8,7 +8,7 @@ const keyHat = { key: "BracketRight", shift: true } // accent circonflexe (accen
 const keyGrave = { key: "BracketRight" } // accent grave, mark ` placed above the letter
 const keyTilde = { key: "Key4", altRight: true } // tilde, mark ~ placed above the letter

-const chars = {
+export const chars = {
  A: { key: "KeyA", shift: true },
  "Ä": { key: "KeyA", shift: true, accentKey: keyTrema },
  "Á": { key: "KeyA", shift: true, accentKey: keyAcute },
@ -166,9 +166,3 @@ const chars = {
  Enter: { key: "Enter" },
  Tab: { key: "Tab" },
 } as Record<string, KeyCombo>;
-
-export const es_ES: KeyboardLayout = {
-  isoCode: "es-ES",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardLayouts/fr_BE.ts
+++ b/ui/src/keyboardLayouts/fr_BE.ts
@ -1,6 +1,6 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-const name = "Belgisch Nederlands";
+export const name = "Belgisch Nederlands";

 const keyTrema = { key: "BracketLeft", shift: true } // tréma (umlaut), two dots placed above a vowel
 const keyHat = { key: "BracketLeft" } // accent circonflexe (accent hat), mark ^ placed above the letter
@ -8,7 +8,7 @@ const keyAcute = { key: "Semicolon", altRight: true } // accent aigu (acute acce
 const keyGrave = { key: "Quote", shift: true } // accent grave, mark ` placed above the letter
 const keyTilde = { key: "Slash", altRight: true } // tilde, mark ~ placed above the letter

-const chars = {
+export const chars = {
  A: { key: "KeyQ", shift: true },
  "Ä": { key: "KeyQ", shift: true, accentKey: keyTrema },
  "Â": { key: "KeyQ", shift: true, accentKey: keyHat },
@ -165,9 +165,3 @@ const chars = {
  Enter: { key: "Enter" },
  Tab: { key: "Tab" },
 } as Record<string, KeyCombo>;
-
-export const fr_BE: KeyboardLayout = {
-  isoCode: "fr-BE",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardLayouts/fr_CH.ts
+++ b/ui/src/keyboardLayouts/fr_CH.ts
@ -1,11 +1,11 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-import { de_CH } from "./de_CH"
+import { chars as chars_de_CH } from "./de_CH"

-const name = "Français de Suisse";
+export const name = "Français de Suisse";

-const chars = {
-  ...de_CH.chars,
+export const chars = {
+  ...chars_de_CH,
  "è": { key: "BracketLeft" },
  "ü": { key: "BracketLeft", shift: true },
  "é": { key: "Semicolon" },
@ -13,9 +13,3 @@ const chars = {
  "à": { key: "Quote" },
  "ä": { key: "Quote", shift: true },
 } as Record<string, KeyCombo>;
-
-export const fr_CH: KeyboardLayout = {
-  isoCode: "fr-CH",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardLayouts/fr_FR.ts
+++ b/ui/src/keyboardLayouts/fr_FR.ts
@ -1,11 +1,11 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-const name = "Français";
+export const name = "Français";

 const keyTrema = { key: "BracketLeft", shift: true } // tréma (umlaut), two dots placed above a vowel
 const keyHat = { key: "BracketLeft" } // accent circonflexe (accent hat), mark ^ placed above the letter

-const chars = {
+export const chars = {
  A: { key: "KeyQ", shift: true },
  "Ä": { key: "KeyQ", shift: true, accentKey: keyTrema },
  "Â": { key: "KeyQ", shift: true, accentKey: keyHat },
@ -137,9 +137,3 @@ const chars = {
  Enter: { key: "Enter" },
  Tab: { key: "Tab" },
 } as Record<string, KeyCombo>;
-
-export const fr_FR: KeyboardLayout = {
-  isoCode: "fr-FR",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardLayouts/it_IT.ts
+++ b/ui/src/keyboardLayouts/it_IT.ts
@ -1,8 +1,8 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-const name = "Italiano";
+export const name = "Italiano";

-const chars = {
+export const chars = {
  A: { key: "KeyA", shift: true },
  B: { key: "KeyB", shift: true },
  C: { key: "KeyC", shift: true },
@ -111,9 +111,3 @@ const chars = {
  Enter: { key: "Enter" },
  Tab: { key: "Tab" },
 } as Record<string, KeyCombo>;
-
-export const it_IT: KeyboardLayout = {
-  isoCode: "it-IT",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardLayouts/nb_NO.ts
+++ b/ui/src/keyboardLayouts/nb_NO.ts
@ -1,6 +1,6 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-const name = "Norsk bokmål";
+export const name = "Norsk bokmål";

 const keyTrema = { key: "BracketRight" } // tréma (umlaut), two dots placed above a vowel
 const keyAcute = { key: "Equal", altRight: true } // accent aigu (acute accent), mark ´ placed above the letter
@ -8,7 +8,7 @@ const keyHat = { key: "BracketRight", shift: true } // accent circonflexe (accen
 const keyGrave = { key: "Equal", shift: true } // accent grave, mark ` placed above the letter
 const keyTilde = { key: "BracketRight", altRight: true } // tilde, mark ~ placed above the letter

-const chars = {
+export const chars = {
  A: { key: "KeyA", shift: true },
  "Ä": { key: "KeyA", shift: true, accentKey: keyTrema },
  "Á": { key: "KeyA", shift: true, accentKey: keyAcute },
@ -165,9 +165,3 @@ const chars = {
  Enter: { key: "Enter" },
  Tab: { key: "Tab" },
 } as Record<string, KeyCombo>;
-
-export const nb_NO: KeyboardLayout = {
-  isoCode: "nb-NO",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardLayouts/sv_SE.ts
+++ b/ui/src/keyboardLayouts/sv_SE.ts
@ -1,6 +1,6 @@
-import { KeyboardLayout, KeyCombo } from "../keyboardLayouts"
+import { KeyCombo } from "../keyboardLayouts"

-const name = "Svenska";
+export const name = "Svenska";

 const keyTrema = { key: "BracketRight" } // tréma (umlaut), two dots placed above a vowel
 const keyAcute = { key: "Equal" } // accent aigu (acute accent), mark ´ placed above the letter
@ -8,7 +8,7 @@ const keyHat = { key: "BracketRight", shift: true } // accent circonflexe (accen
 const keyGrave = { key: "Equal", shift: true } // accent grave, mark ` placed above the letter
 const keyTilde = { key: "BracketRight", altRight: true } // tilde, mark ~ placed above the letter

-const chars = {
+export const chars = {
  A: { key: "KeyA", shift: true },
  "Á": { key: "KeyA", shift: true, accentKey: keyAcute },
  "Â": { key: "KeyA", shift: true, accentKey: keyHat },
@ -162,9 +162,3 @@ const chars = {
  Enter: { key: "Enter" },
  Tab: { key: "Tab" },
 } as Record<string, KeyCombo>;
-
-export const sv_SE: KeyboardLayout = {
-  isoCode: "sv-SE",
-  name: name,
-  chars: chars
-};
--- a/ui/src/keyboardMappings.ts
+++ b/ui/src/keyboardMappings.ts
@ -1,19 +1,17 @@
 // Key codes and modifiers correspond to definitions in the
 // [Linux USB HID gadget driver](https://www.kernel.org/doc/Documentation/usb/gadget_hid.txt)
-// [Section 10. Keyboard/Keypad Page 0x07](https://usb.org/sites/default/files/hut1_21.pdf)
 export const keys = {
  ArrowDown: 0x51,
  ArrowLeft: 0x50,
  ArrowRight: 0x4f,
  ArrowUp: 0x52,
-  Backquote: 0x35,    // aka Grave
+  Backquote: 0x35,
  Backslash: 0x31,
  Backspace: 0x2a,
-  BracketLeft: 0x2f,  // aka LeftBrace
-  BracketRight: 0x30, // aka RightBrace
+  BracketLeft: 0x2f,
+  BracketRight: 0x30,
  CapsLock: 0x39,
  Comma: 0x36,
-  Compose: 0x65,
  ContextMenu: 0,
  Delete: 0x4c,
  Digit0: 0x27,
@ -42,21 +40,10 @@ export const keys = {
  F10: 0x43,
  F11: 0x44,
  F12: 0x45,
-  F14: 0x69,
-  F15: 0x6a,
-  F16: 0x6b,
-  F17: 0x6c,
-  F18: 0x6d,
-  F19: 0x6e,
-  F20: 0x6f,
-  F21: 0x70,
-  F22: 0x71,
-  F23: 0x72,
-  F24: 0x73,
+  F13: 0x68,
  Home: 0x4a,
-  HashTilde: 0x32,  // non-US # and ~
  Insert: 0x49,
-  IntlBackslash: 0x64, // non-US \ and |
+  IntlBackslash: 0x64,
  KeyA: 0x04,
  KeyB: 0x05,
  KeyC: 0x06,
@ -85,35 +72,30 @@ export const keys = {
  KeyZ: 0x1d,
  KeypadExclamation: 0xcf,
  Minus: 0x2d,
-  None: 0x00,
-  NumLock: 0x53,  // and Clear
-  Numpad0: 0x62,  // and Insert
-  Numpad1: 0x59,  // and End
-  Numpad2: 0x5a,  // and Down Arrow
-  Numpad3: 0x5b,  // and Page Down
-  Numpad4: 0x5c,  // and Left Arrow
+  NumLock: 0x53,
+  Numpad0: 0x62,
+  Numpad1: 0x59,
+  Numpad2: 0x5a,
+  Numpad3: 0x5b,
+  Numpad4: 0x5c,
  Numpad5: 0x5d,
-  Numpad6: 0x5e,  // and Right Arrow
-  Numpad7: 0x5f,  // and Home
-  Numpad8: 0x60,  // and Up Arrow
-  Numpad9: 0x61,  // and Page Up
+  Numpad6: 0x5e,
+  Numpad7: 0x5f,
+  Numpad8: 0x60,
+  Numpad9: 0x61,
  NumpadAdd: 0x57,
-  NumpadComma: 0x85,
-  NumpadDecimal: 0x63,
  NumpadDivide: 0x54,
  NumpadEnter: 0x58,
  NumpadEqual: 0x67,
-  NumpadLeftParen: 0xb6,
  NumpadMultiply: 0x55,
-  NumpadRightParen: 0xb7,
  NumpadSubtract: 0x56,
+  NumpadDecimal: 0x63,
  PageDown: 0x4e,
  PageUp: 0x4b,
  Period: 0x37,
  PrintScreen: 0x46,
  Pause: 0x48,
-  Power: 0x66,
-  Quote: 0x34, // aka Single Quote or Apostrophe
+  Quote: 0x34,
  ScrollLock: 0x47,
  Semicolon: 0x33,
  Slash: 0x38,
--- a/ui/src/routes/devices.$id.settings.keyboard.tsx
+++ b/ui/src/routes/devices.$id.settings.keyboard.tsx
@ -4,7 +4,7 @@ import { KeyboardLedSync, useSettingsStore } from "@/hooks/stores";
 import { useJsonRpc } from "@/hooks/useJsonRpc";
 import notifications from "@/notifications";
 import { SettingsPageHeader } from "@components/SettingsPageheader";
-import { keyboardOptions } from "@/keyboardLayouts";
+import { layouts } from "@/keyboardLayouts";
 import { Checkbox } from "@/components/Checkbox";

 import { SelectMenuBasic } from "../components/SelectMenuBasic";
@ -32,7 +32,7 @@ export default function SettingsKeyboardRoute() {
      return "en_US";
  }, [keyboardLayout]);

-  const layoutOptions = keyboardOptions();
+  const layoutOptions = Object.entries(layouts).map(([code, language]) => { return { value: code, label: language } })
  const ledSyncOptions = [
    { value: "auto", label: "Automatic" },
    { value: "browser", label: "Browser Only" },
@ -46,7 +46,7 @@ export default function SettingsKeyboardRoute() {
      if ("error" in resp) return;
      setKeyboardLayout(resp.result as string);
    });
-  }, [send, setKeyboardLayout]);
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps

  const onKeyboardLayoutChange = useCallback(
    (e: React.ChangeEvent<HTMLSelectElement>) => {
--- a/ui/src/routes/devices.$id.settings.network.tsx
+++ b/ui/src/routes/devices.$id.settings.network.tsx
@ -34,7 +34,6 @@ dayjs.extend(relativeTime);

 const defaultNetworkSettings: NetworkSettings = {
  hostname: "",
-  http_proxy: "",
  domain: "",
  ipv4_mode: "unknown",
  ipv6_mode: "unknown",
@ -186,10 +185,6 @@ export default function SettingsNetworkRoute() {
    setNetworkSettings({ ...networkSettings, hostname: value });
  };

-  const handleProxyChange = (value: string) => {
-    setNetworkSettings({ ...networkSettings, http_proxy: value });
-  };
-
  const handleDomainChange = (value: string) => {
    setNetworkSettings({ ...networkSettings, domain: value });
  };
@ -258,26 +253,6 @@ export default function SettingsNetworkRoute() {
            </div>
          </SettingsItem>
        </div>
-        <div className="space-y-4">
-          <SettingsItem
-            title="HTTP Proxy"
-            description="Proxy server for outgoing HTTP(S) requests from the device. Blank for none."
-          >
-            <div className="relative">
-              <div>
-                <InputField
-                  size="SM"
-                  type="text"
-                  placeholder="http://proxy.example.com:8080/"
-                  defaultValue={networkSettings.http_proxy}
-                  onChange={e => {
-                    handleProxyChange(e.target.value);
-                  }}
-                />
-              </div>
-            </div>
-          </SettingsItem>
-        </div>

        <div className="space-y-4">
          <div className="space-y-1">
--- a/ui/src/routes/devices.$id.settings.tsx
+++ b/ui/src/routes/devices.$id.settings.tsx
@ -79,7 +79,7 @@ export default function SettingsRoute() {
    return () => {
      setDisableVideoFocusTrap(false);
    };
-  }, [sendKeyboardEvent, setDisableVideoFocusTrap]);
+  }, [setDisableVideoFocusTrap, sendKeyboardEvent]);

  return (
    <div className="pointer-events-auto relative mx-auto max-w-4xl translate-x-0 transform text-left dark:text-white">
@ -151,6 +151,7 @@ export default function SettingsRoute() {
                    className={({ isActive }) => (isActive ? "active" : "")}
                  >
                    <div className="flex items-center gap-x-2 rounded-md px-2.5 py-2.5 text-sm transition-colors hover:bg-slate-100 dark:hover:bg-slate-700 in-[.active]:bg-blue-50 in-[.active]:text-blue-700! md:in-[.active]:bg-transparent dark:in-[.active]:bg-blue-900 dark:in-[.active]:text-blue-200! dark:md:in-[.active]:bg-transparent">
+
                      <LuMouse className="h-4 w-4 shrink-0" />
                      <h1>Mouse</h1>
                    </div>
@ -162,7 +163,7 @@ export default function SettingsRoute() {
                      to="keyboard"
                      className={({ isActive }) => (isActive ? "active" : "")}
                    >
-                      <div className="flex items-center gap-x-2 rounded-md px-2.5 py-2.5 text-sm transition-colors hover:bg-slate-100 dark:hover:bg-slate-700 in-[.active]:bg-blue-50 in-[.active]:text-blue-700! md:in-[.active]:bg-transparent dark:in-[.active]:bg-blue-900 dark:in-[.active]:text-blue-200! dark:md:in-[.active]:bg-transparent">
+                      <div className="flex items-center gap-x-2 rounded-md px-2.5 py-2.5 text-sm transition-colors hover:bg-slate-100 dark:hover:bg-slate-700 [.active_&]:bg-blue-50 [.active_&]:!text-blue-700 md:[.active_&]:bg-transparent dark:[.active_&]:bg-blue-900 dark:[.active_&]:!text-blue-200 dark:md:[.active_&]:bg-transparent">
                        <LuKeyboard className="h-4 w-4 shrink-0" />
                        <h1>Keyboard</h1>
                      </div>
--- a/ui/src/routes/devices.$id.tsx
+++ b/ui/src/routes/devices.$id.tsx
@ -707,7 +707,7 @@ export default function KvmIdRoute() {
  }, [diskChannel, file]);

  // System update
-  const disableVideoFocusTrap = useUiStore(state => state.disableVideoFocusTrap);
+  const disableKeyboardFocusTrap = useUiStore(state => state.disableVideoFocusTrap);

  const [kvmTerminal, setKvmTerminal] = useState<RTCDataChannel | null>(null);
  const [serialConsole, setSerialConsole] = useState<RTCDataChannel | null>(null);
@ -805,7 +805,7 @@ export default function KvmIdRoute() {
      )}
      <div className="relative h-full">
        <FocusTrap
-          paused={disableVideoFocusTrap}
+          paused={disableKeyboardFocusTrap}
          focusTrapOptions={{
            allowOutsideClick: true,
            escapeDeactivates: false,
--- a/wol.go
+++ b/wol.go
@ -4,24 +4,6 @@ import (
 	"bytes"
 	"encoding/binary"
 	"net"
-
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-)
-
-var (
-	wolPackets = promauto.NewCounter(
-		prometheus.CounterOpts{
-			Name: "jetkvm_wol_sent_packets_total",
-			Help: "Total number of Wake-on-LAN magic packets sent.",
-		},
-	)
-	wolErrors = promauto.NewCounter(
-		prometheus.CounterOpts{
-			Name: "jetkvm_wol_sent_packet_errors_total",
-			Help: "Total number of Wake-on-LAN magic packets errors.",
-		},
-	)
 )

 // SendWOLMagicPacket sends a Wake-on-LAN magic packet to the specified MAC address
@ -29,7 +11,6 @@ func rpcSendWOLMagicPacket(macAddress string) error {
 	// Parse the MAC address
 	mac, err := net.ParseMAC(macAddress)
 	if err != nil {
-		wolErrors.Inc()
 		return ErrorfL(wolLogger, "invalid MAC address", err)
 	}

@ -39,7 +20,6 @@ func rpcSendWOLMagicPacket(macAddress string) error {
 	// Set up UDP connection
 	conn, err := net.Dial("udp", "255.255.255.255:9")
 	if err != nil {
-		wolErrors.Inc()
 		return ErrorfL(wolLogger, "failed to establish UDP connection", err)
 	}
 	defer conn.Close()
@ -47,12 +27,10 @@ func rpcSendWOLMagicPacket(macAddress string) error {
 	// Send the packet
 	_, err = conn.Write(packet)
 	if err != nil {
-		wolErrors.Inc()
 		return ErrorfL(wolLogger, "failed to send WOL packet", err)
 	}

 	wolLogger.Info().Str("mac", macAddress).Msg("WOL packet sent")
-	wolPackets.Inc()

 	return nil
 }