diff --git a/pkgs/webview-ui/app/src/Form/form/index.tsx b/pkgs/webview-ui/app/src/Form/form/index.tsx
index 9083335f2..cf2f2d42c 100644
--- a/pkgs/webview-ui/app/src/Form/form/index.tsx
+++ b/pkgs/webview-ui/app/src/Form/form/index.tsx
@@ -96,6 +96,7 @@ export const DynForm = (props: FormProps) => {
 
   return (
     <>
+      {/* @ts-expect-error: This happened after solidjs upgrade. TOOD: fixme */}
       <ModuleForm {...props.formProps} onSubmit={handleSubmit}>
         {props.components?.before}
         <SchemaFields
diff --git a/pkgs/webview-ui/app/src/api/inventory.ts b/pkgs/webview-ui/app/src/api/inventory.ts
index b77f47c89..199a2f7ea 100644
--- a/pkgs/webview-ui/app/src/api/inventory.ts
+++ b/pkgs/webview-ui/app/src/api/inventory.ts
@@ -98,7 +98,6 @@ export async function set_single_service<T extends keyof Services>(
     inventory.services = inventory.services || {};
     inventory.services[service_name] = inventory.services[service_name] || {};
 
-    // @ts-expect-error: This doesn't check
     inventory.services[service_name][instance_key] = service_config;
     console.log("saving inventory", inventory);
     return callApi("set_inventory", {
diff --git a/pkgs/webview-ui/app/src/components/Sidebar/SidebarHeader.tsx b/pkgs/webview-ui/app/src/components/Sidebar/SidebarHeader.tsx
index 530c1ef9b..d055a31c5 100644
--- a/pkgs/webview-ui/app/src/components/Sidebar/SidebarHeader.tsx
+++ b/pkgs/webview-ui/app/src/components/Sidebar/SidebarHeader.tsx
@@ -55,7 +55,7 @@ export const SidebarHeader = (props: SidebarProps) => {
     <header class="sidebar__header">
       <div onClick={handleClick} class="sidebar__header__inner">
         {/* <ClanProfile clanName={props.clanName} showFlyout={showFlyout} /> */}
-        <div class="w-full text-white pl-1">
+        <div class="w-full pl-1 text-white">
           <ClanTitle clanName={props.clanName} />
         </div>
         <Show
diff --git a/pkgs/webview-ui/app/src/components/Typography/index.tsx b/pkgs/webview-ui/app/src/components/Typography/index.tsx
index e55991473..fcc829ab0 100644
--- a/pkgs/webview-ui/app/src/components/Typography/index.tsx
+++ b/pkgs/webview-ui/app/src/components/Typography/index.tsx
@@ -84,6 +84,7 @@ interface _TypographyProps<H extends Hierarchy> {
   inverted?: boolean;
   tag?: Tag;
   class?: string;
+  classList?: Record<string, boolean>;
 }
 
 export const Typography = <H extends Hierarchy>(props: _TypographyProps<H>) => {
diff --git a/pkgs/webview-ui/app/src/helper.ts b/pkgs/webview-ui/app/src/helper.ts
deleted file mode 100644
index 38a3e41f9..000000000
--- a/pkgs/webview-ui/app/src/helper.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// renderRoutes.ts
-import { Route } from "@solidjs/router";
-import type { JSXElement } from "solid-js";
-
-export type AppRoute = {
-  path: string;
-  component?: () => JSXElement;
-  children?: AppRoute[];
-};
-
-export function renderRoutes(routes: AppRoute[], parentPath = ""): JSXElement[] {
-  return routes.map(({ path, component, children }) => {
-    const fullPath = `${parentPath}/${path}`.replace(/\/+/g, "/");
-
-    return (
-        <Route path={path} component={component} key={fullPath}>
-  {children && renderRoutes(children, fullPath)}
-</Route>
-    );
-  });
-}
diff --git a/pkgs/webview-ui/app/src/routes/flash/view.tsx b/pkgs/webview-ui/app/src/routes/flash/view.tsx
index b0486231f..2076fe2fc 100644
--- a/pkgs/webview-ui/app/src/routes/flash/view.tsx
+++ b/pkgs/webview-ui/app/src/routes/flash/view.tsx
@@ -325,7 +325,7 @@ export const Flash = () => {
             <FieldLayout
               label={<InputLabel>Networks</InputLabel>}
               field={
-                <div class="w-full flex justify-end">
+                <div class="flex w-full justify-end">
                   <Button
                     type="button"
                     size="s"
diff --git a/pkgs/webview-ui/app/src/routes/machines/details.tsx b/pkgs/webview-ui/app/src/routes/machines/details.tsx
index 2982d257e..38740fb27 100644
--- a/pkgs/webview-ui/app/src/routes/machines/details.tsx
+++ b/pkgs/webview-ui/app/src/routes/machines/details.tsx
@@ -244,7 +244,7 @@ const InstallMachine = (props: InstallMachineProps) => {
                 <div class="flex flex-col items-center gap-3 fg-def-1">
                   <Typography
                     classList={{
-                      [cx("bg-inv-4 fg-inv-1")]: idx == step(),
+                      [cx("bg-inv-4 fg-inv-1")]: idx === step(),
                       [cx("bg-def-4 fg-def-1")]: idx < step(),
                     }}
                     color="inherit"
@@ -522,8 +522,8 @@ const MachineForm = (props: MachineDetailsProps) => {
   return (
     <>
       <div class="flex flex-col gap-6">
-        <div class="sticky top-0 flex items-center justify-end gap-2 bg-secondary-50 border-b border-secondary-100 py-2 px-4">
-          <div class="flex gap-3 items-center">
+        <div class="sticky top-0 flex items-center justify-end gap-2 border-b border-secondary-100 bg-secondary-50 px-4 py-2">
+          <div class="flex items-center gap-3">
             <div class="w-fit" data-tip="Machine must be online">
               {/* <Button
                 class="w-full"
@@ -542,7 +542,7 @@ const MachineForm = (props: MachineDetailsProps) => {
               remote device.
             </Typography> */}
           </div>
-          <div class="flex gap-3 items-center">
+          <div class="flex items-center gap-3">
             <div class="button-group flex">
               <Button
                 variant="light"
@@ -606,7 +606,7 @@ const MachineForm = (props: MachineDetailsProps) => {
               </Field>
               <Field name="machine.tags" type="string[]">
                 {(field, props) => (
-                  <div class="flex gap-4 items-center">
+                  <div class="flex items-center gap-4">
                     <Typography hierarchy="label" size="default" weight="bold">
                       Tags{" "}
                     </Typography>