diff --git a/fakemui/index.ts b/fakemui/index.ts
index dff7dcdb8..073c3d880 100644
--- a/fakemui/index.ts
+++ b/fakemui/index.ts
@@ -72,6 +72,11 @@ export {
   InputBase,
   FilledInput,
   OutlinedInput,
+  FormField,
+  DatePicker,
+  TimePicker,
+  ColorPicker,
+  FileUpload,
 } from './fakemui/inputs'
 
 // Surfaces
diff --git a/frontends/nextjs/src/lib/rendering/component-registry.ts b/frontends/nextjs/src/lib/rendering/component-registry.ts
index a9bff87c0..516ef8125 100644
--- a/frontends/nextjs/src/lib/rendering/component-registry.ts
+++ b/frontends/nextjs/src/lib/rendering/component-registry.ts
@@ -88,7 +88,11 @@ import {
   Popover,
 } from '@/fakemui'
 
-import type { ComponentType } from 'react'
+import type { ComponentType, FC } from 'react'
+
+// Type helper to cast components to generic LuaComponentProps
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type AnyComponent = FC<any>
 
 /**
  * Type definition for component props from Lua
@@ -133,6 +137,17 @@ export const componentRegistry: Record<string, ComponentType<LuaComponentProps>>
   RadioGroup,
   Switch,
   Slider,
+  // New inputs
+  DatePicker,
+  TimePicker,
+  ColorPicker,
+  FileUpload,
+  Fab,
+  ToggleButton,
+  ToggleButtonGroup,
+  Autocomplete,
+  Rating,
+  FormField,
 
   // Form elements
   FormControl,