diff --git a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/BooleanPropEditor.tsx b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/BooleanPropEditor.tsx
index 0621755..88d8d3d 100644
--- a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/BooleanPropEditor.tsx
+++ b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/BooleanPropEditor.tsx
@@ -4,8 +4,9 @@ import React, {useCallback} from 'react'
 import {useEditingToolsForPrimitiveProp} from './utils/useEditingToolsForPrimitiveProp'
 import {SingleRowPropEditor} from './utils/SingleRowPropEditor'
 import styled from 'styled-components'
+import BasicCheckbox from '@theatre/studio/uiComponents/form/BasicCheckbox'
 
-const Input = styled.input`
+const Input = styled(BasicCheckbox)`
   margin-left: 6px;
 `
 
@@ -25,7 +26,7 @@ const BooleanPropEditor: React.FC<{
 
   return (
     <SingleRowPropEditor {...{stuff, propConfig, pointerToProp}}>
-      <Input type="checkbox" checked={stuff.value} onChange={onChange} />
+      <Input checked={stuff.value} onChange={onChange} />
     </SingleRowPropEditor>
   )
 }
diff --git a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/NumberPropEditor.tsx b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/NumberPropEditor.tsx
index c5a47fb..8e08252 100644
--- a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/NumberPropEditor.tsx
+++ b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/NumberPropEditor.tsx
@@ -1,6 +1,6 @@
 import type {PropTypeConfig_Number} from '@theatre/core/propTypes'
 import type SheetObject from '@theatre/core/sheetObjects/SheetObject'
-import BasicNumberEditor from '@theatre/studio/uiComponents/form/BasicNumberEditor'
+import BasicNumberInput from '@theatre/studio/uiComponents/form/BasicNumberInput'
 import React from 'react'
 import {useEditingToolsForPrimitiveProp} from './utils/useEditingToolsForPrimitiveProp'
 import {SingleRowPropEditor} from './utils/SingleRowPropEditor'
@@ -14,7 +14,7 @@ const NumberPropEditor: React.FC<{
 
   return (
     <SingleRowPropEditor {...{stuff, propConfig, pointerToProp}}>
-      <BasicNumberEditor
+      <BasicNumberInput
         value={stuff.value}
         temporarilySetValue={stuff.temporarilySetValue}
         discardTemporaryValue={stuff.discardTemporaryValue}
diff --git a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/StringLiteralPropEditor.tsx b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/StringLiteralPropEditor.tsx
index f577c2f..214d79a 100644
--- a/theatre/studio/src/panels/ObjectEditorPanel/propEditors/StringLiteralPropEditor.tsx
+++ b/theatre/studio/src/panels/ObjectEditorPanel/propEditors/StringLiteralPropEditor.tsx
@@ -3,8 +3,8 @@ import type SheetObject from '@theatre/core/sheetObjects/SheetObject'
 import React, {useCallback} from 'react'
 import {useEditingToolsForPrimitiveProp} from './utils/useEditingToolsForPrimitiveProp'
 import type {$IntentionalAny} from '@theatre/shared/utils/types'
-import BasicSwitchEditor from '@theatre/studio/uiComponents/form/BasicSwitchEditor'
-import BasicSelectEditor from '@theatre/studio/uiComponents/form/BasicSelectEditor'
+import BasicSwitch from '@theatre/studio/uiComponents/form/BasicSwitch'
+import BasicSelect from '@theatre/studio/uiComponents/form/BasicSelect'
 import {SingleRowPropEditor} from './utils/SingleRowPropEditor'
 
 const StringLiteralPropEditor: React.FC<{
@@ -24,13 +24,13 @@ const StringLiteralPropEditor: React.FC<{
   return (
     <SingleRowPropEditor {...{stuff, propConfig, pointerToProp}}>
       {propConfig.as === 'menu' ? (
-        <BasicSelectEditor
+        <BasicSelect
           value={stuff.value}
           onChange={onChange}
           options={propConfig.options}
         />
       ) : (
-        <BasicSwitchEditor
+        <BasicSwitch
           value={stuff.value}
           onChange={onChange}
           options={propConfig.options}
diff --git a/theatre/studio/src/uiComponents/form/BasicCheckbox.tsx b/theatre/studio/src/uiComponents/form/BasicCheckbox.tsx
new file mode 100644
index 0000000..395de3f
--- /dev/null
+++ b/theatre/studio/src/uiComponents/form/BasicCheckbox.tsx
@@ -0,0 +1,7 @@
+import styled from 'styled-components'
+
+const BasicCheckbox = styled.input.attrs({type: 'checkbox'})`
+  outline: none;
+`
+
+export default BasicCheckbox
diff --git a/theatre/studio/src/uiComponents/form/BasicNumberEditor.tsx b/theatre/studio/src/uiComponents/form/BasicNumberInput.tsx
similarity index 98%
rename from theatre/studio/src/uiComponents/form/BasicNumberEditor.tsx
rename to theatre/studio/src/uiComponents/form/BasicNumberInput.tsx
index 46bc76c..93e8597 100644
--- a/theatre/studio/src/uiComponents/form/BasicNumberEditor.tsx
+++ b/theatre/studio/src/uiComponents/form/BasicNumberInput.tsx
@@ -59,7 +59,7 @@ type IState_Dragging = {
 
 type IState = IState_NoFocus | IState_EditingViaKeyboard | IState_Dragging
 
-const BasicNumberEditor: React.FC<{
+const BasicNumberInput: React.FC<{
   value: number
   temporarilySetValue: (v: number) => void
   discardTemporaryValue: () => void
@@ -257,4 +257,4 @@ function format(v: number): string {
   return isNaN(v) ? 'NaN' : isInteger(v) ? v.toFixed(0) : round(v, 3).toString()
 }
 
-export default BasicNumberEditor
+export default BasicNumberInput
diff --git a/theatre/studio/src/uiComponents/form/BasicSelectEditor.tsx b/theatre/studio/src/uiComponents/form/BasicSelect.tsx
similarity index 96%
rename from theatre/studio/src/uiComponents/form/BasicSelectEditor.tsx
rename to theatre/studio/src/uiComponents/form/BasicSelect.tsx
index d00861d..1c7cacd 100644
--- a/theatre/studio/src/uiComponents/form/BasicSelectEditor.tsx
+++ b/theatre/studio/src/uiComponents/form/BasicSelect.tsx
@@ -31,7 +31,7 @@ const Select = styled.select`
   }
 `
 
-const BasicSelectEditor: React.FC<{
+const BasicSelect: React.FC<{
   value: string
   onChange: (val: string) => void
   options: Record<string, string>
@@ -54,4 +54,4 @@ const BasicSelectEditor: React.FC<{
   )
 }
 
-export default BasicSelectEditor
+export default BasicSelect
diff --git a/theatre/studio/src/uiComponents/form/BasicSwitchEditor.tsx b/theatre/studio/src/uiComponents/form/BasicSwitch.tsx
similarity index 95%
rename from theatre/studio/src/uiComponents/form/BasicSwitchEditor.tsx
rename to theatre/studio/src/uiComponents/form/BasicSwitch.tsx
index 6ff30a7..9237660 100644
--- a/theatre/studio/src/uiComponents/form/BasicSwitchEditor.tsx
+++ b/theatre/studio/src/uiComponents/form/BasicSwitch.tsx
@@ -47,7 +47,7 @@ const Input = styled.input`
   height: 0;
 `
 
-const BasicSwitchEditor: React.FC<{
+const BasicSwitch: React.FC<{
   value: string
   onChange: (val: string) => void
   options: Record<string, string>
@@ -76,4 +76,4 @@ const BasicSwitchEditor: React.FC<{
   )
 }
 
-export default BasicSwitchEditor
+export default BasicSwitch