diff --git a/src/components/shared/inputs/ColumnTypeInput.js b/src/components/shared/inputs/ColumnTypeInput.js
index b584b5a..5a02a49 100644
--- a/src/components/shared/inputs/ColumnTypeInput.js
+++ b/src/components/shared/inputs/ColumnTypeInput.js
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
 import { cn, getPCN } from '../../../utils/classes'
-import SelectInput from './SelectInput'
+import { SelectInput } from 'ui'
 import {
     INT2,
     INT4,
diff --git a/src/components/shared/panels/EditColumnPanel.js b/src/components/shared/panels/EditColumnPanel.js
index 28e2f48..54fbed8 100644
--- a/src/components/shared/panels/EditColumnPanel.js
+++ b/src/components/shared/panels/EditColumnPanel.js
@@ -1,6 +1,6 @@
 import React, { useState, useCallback, useMemo, useRef, forwardRef, useImperativeHandle } from 'react'
 import { getPCN, cn } from '../../../utils/classes'
-import SelectInput from '../inputs/SelectInput'
+import { SelectInput } from 'ui'
 import { noop } from '../../../utils/nodash'
 import { keyIcon, modelRelationshipIcon, requiredIcon } from '../../../svgs/icons'
 import { cloneDeep } from 'lodash-es'
diff --git a/src/components/shared/panels/EditableLiveColumns.js b/src/components/shared/panels/EditableLiveColumns.js
index 8521c92..eebc42a 100644
--- a/src/components/shared/panels/EditableLiveColumns.js
+++ b/src/components/shared/panels/EditableLiveColumns.js
@@ -1,7 +1,7 @@
 import React, { useMemo, useRef, useCallback, useState, forwardRef, useImperativeHandle } from 'react'
 import { cn, getPCN } from '../../../utils/classes'
-import TextInput from '../../shared/inputs/TextInput'
-import SelectInput from '../../shared/inputs/SelectInput'
+import { TextInput } from 'ui'
+import { SelectInput } from 'ui'
 import { noop } from '../../../utils/nodash'
 import { camelToSnake, snakeToCamel, unique } from '../../../utils/formatters'
 import { cloneDeep } from 'lodash-es'
diff --git a/src/components/shared/panels/LiveColumnFilters.js b/src/components/shared/panels/LiveColumnFilters.js
index 99565c5..5abb04e 100644
--- a/src/components/shared/panels/LiveColumnFilters.js
+++ b/src/components/shared/panels/LiveColumnFilters.js
@@ -1,7 +1,7 @@
 import React, { useMemo, useRef, useCallback, useState, forwardRef, useImperativeHandle, useEffect } from 'react'
 import { getPCN, cn } from '../../../utils/classes'
 import $ from 'jquery'
-import SelectInput from '../../shared/inputs/SelectInput'
+import { SelectInput } from 'ui'
 import { columnOps, filterOptions, filterOps, multiValueOps } from '../../../utils/filters'
 import { propertyIsEnum, formatPropertyOptionsForSelection, resolvedPropertyType } from '../../../utils/liveObjects'
 import closeIcon from '../../../svgs/close'
diff --git a/src/components/shared/panels/NewTableBasicInputs.js b/src/components/shared/panels/NewTableBasicInputs.js
index 9a84104..eea7a16 100644
--- a/src/components/shared/panels/NewTableBasicInputs.js
+++ b/src/components/shared/panels/NewTableBasicInputs.js
@@ -1,6 +1,6 @@
 import React, { useState, useImperativeHandle, forwardRef } from 'react'
 import { getPCN } from '../../../utils/classes'
-import TextInput from '../../shared/inputs/TextInput'
+import { TextInput } from 'ui'
 import { noop } from '../../../utils/nodash'
 
 const className = 'new-table-basic-inputs'
diff --git a/src/components/shared/prompts/AddForeignKeyPrompt.js b/src/components/shared/prompts/AddForeignKeyPrompt.js
index 78c33db..81d50c5 100644
--- a/src/components/shared/prompts/AddForeignKeyPrompt.js
+++ b/src/components/shared/prompts/AddForeignKeyPrompt.js
@@ -3,8 +3,8 @@ import { getPCN, cn } from '../../../utils/classes'
 import { helpIcon, checkIcon, closeIcon, openArrowIcon } from '../../../svgs/icons'
 import { noop } from '../../../utils/nodash'
 import { camelToSnake } from '../../../utils/formatters'
-import TextInput from '../inputs/TextInput'
-import SelectInput from '../inputs/SelectInput'
+import { TextInput } from 'ui'
+import { SelectInput } from 'ui'
 import spinner from '../../../svgs/chasing-tail-spinner'
 
 const className = 'add-foreign-key-prompt'
diff --git a/src/components/tables/TablesBody.js b/src/components/tables/TablesBody.js
index 57566fb..84acb92 100644
--- a/src/components/tables/TablesBody.js
+++ b/src/components/tables/TablesBody.js
@@ -4,7 +4,7 @@ import { cn, getPCN } from '../../utils/classes'
 import Slider from '../shared/sliders/Slider'
 import NewLiveColumnPanel, { referrers } from '../shared/panels/NewLiveColumnPanel'
 import CountUp from 'react-countup'
-import NewColumnDropdown from '../shared/dropdowns/NewColumnDropdown'
+import { NewColumnDropdown } from 'ui'
 import pm from '../../managers/project/projectManager'
 import { selectTableRecords, selectTableCount } from '../../sql'
 import { sum } from '../../utils/math'