diff --git a/src/deck-components/Slider.tsx b/src/deck-components/SliderField.tsx
similarity index 80%
rename from src/deck-components/Slider.tsx
rename to src/deck-components/SliderField.tsx
index 92f90f2..dd2730b 100644
--- a/src/deck-components/Slider.tsx
+++ b/src/deck-components/SliderField.tsx
@@ -9,7 +9,7 @@ export interface NotchLabel {
   value?: number;
 }
 
-export interface SliderProps extends ItemProps {
+export interface SliderFieldProps extends ItemProps {
   value: number;
   min?: number;
   max?: number;
@@ -27,6 +27,6 @@ export interface SliderProps extends ItemProps {
   onChange?(value: number): void;
 }
 
-export const Slider = Object.values(CommonUIModule).find((mod: any) =>
+export const SliderField = Object.values(CommonUIModule).find((mod: any) =>
   mod?.toString()?.includes('SliderField,fallback'),
-) as FC<SliderProps>;
+) as FC<SliderFieldProps>;
diff --git a/src/deck-components/Toggle.tsx b/src/deck-components/Toggle.tsx
index 013af96..0836eb3 100644
--- a/src/deck-components/Toggle.tsx
+++ b/src/deck-components/Toggle.tsx
@@ -1,14 +1,14 @@
 import { FC } from 'react';
 
 import { CommonUIModule } from '../webpack';
-import { ItemProps } from './Item';
 
-export interface ToggleProps extends ItemProps {
-  checked: boolean;
+export interface ToggleProps {
+  value: boolean;
   disabled?: boolean;
   onChange?(checked: boolean): void;
+  navRef?: any; // TODO figure out what this is
 }
 
 export const Toggle = Object.values(CommonUIModule).find((mod: any) =>
-  mod?.render?.toString()?.includes('ToggleField,fallback'),
+  mod?.render?.toString()?.includes('.ToggleOff)'),
 ) as FC<ToggleProps>;
diff --git a/src/deck-components/ToggleField.tsx b/src/deck-components/ToggleField.tsx
new file mode 100644
index 0000000..9fb828b
--- /dev/null
+++ b/src/deck-components/ToggleField.tsx
@@ -0,0 +1,14 @@
+import { FC } from 'react';
+
+import { CommonUIModule } from '../webpack';
+import { ItemProps } from './Item';
+
+export interface ToggleFieldProps extends ItemProps {
+  checked: boolean;
+  disabled?: boolean;
+  onChange?(checked: boolean): void;
+}
+
+export const ToggleField = Object.values(CommonUIModule).find((mod: any) =>
+  mod?.render?.toString()?.includes('ToggleField,fallback'),
+) as FC<ToggleFieldProps>;
diff --git a/src/deck-components/index.ts b/src/deck-components/index.ts
index a1876e7..9bbe83e 100755
--- a/src/deck-components/index.ts
+++ b/src/deck-components/index.ts
@@ -9,9 +9,10 @@ export * from './Panel';
 export * from './ProgressBar';
 export * from './Router';
 export * from './SidebarNavigation';
-export * from './Slider';
+export * from './SliderField';
 export * from './Spinner';
 export * from './static-classes';
 export * from './SteamSpinner';
 export * from './TextField';
 export * from './Toggle';
+export * from './ToggleField';