diff --git a/desktop/app/src/index.tsx b/desktop/app/src/index.tsx
index 956964bf0..8f722f33b 100644
--- a/desktop/app/src/index.tsx
+++ b/desktop/app/src/index.tsx
@@ -87,11 +87,6 @@ export {
   default as ManagedTable_immutable,
   ManagedTableProps_immutable,
 } from './ui/components/table/ManagedTable_immutable';
-export {
-  Value,
-  renderValue,
-  valueToNullableString,
-} from './ui/components/table/TypeBasedValueRenderer';
 export {
   DataValueExtractor,
   DataInspectorExpanded,
diff --git a/desktop/app/src/ui/index.tsx b/desktop/app/src/ui/index.tsx
index c4288fa35..b9c14019b 100644
--- a/desktop/app/src/ui/index.tsx
+++ b/desktop/app/src/ui/index.tsx
@@ -40,9 +40,6 @@ export {ManagedTableProps} from './components/table/ManagedTable';
 export {default as ManagedTable_immutable} from './components/table/ManagedTable_immutable';
 export {ManagedTableProps_immutable} from './components/table/ManagedTable_immutable';
 
-export {Value} from './components/table/TypeBasedValueRenderer';
-export {renderValue} from './components/table/TypeBasedValueRenderer';
-
 export {DataValueExtractor, DataInspectorExpanded} from 'flipper-plugin';
 export {DataInspector as ManagedDataInspector} from 'flipper-plugin';
 export {default as SearchableDataInspector} from './components/data-inspector/SearchableDataInspector';
diff --git a/desktop/plugins/public/databases/ClientProtocol.tsx b/desktop/plugins/public/databases/ClientProtocol.tsx
index 6865b46dc..b14a04f14 100644
--- a/desktop/plugins/public/databases/ClientProtocol.tsx
+++ b/desktop/plugins/public/databases/ClientProtocol.tsx
@@ -7,7 +7,7 @@
  * @format
  */
 
-import {Value} from 'flipper';
+import {Value} from './TypeBasedValueRenderer';
 
 type DatabaseListRequest = {};
 
diff --git a/desktop/plugins/public/databases/DatabaseDetailSidebar.tsx b/desktop/plugins/public/databases/DatabaseDetailSidebar.tsx
index 816eff46b..f3a77a10e 100644
--- a/desktop/plugins/public/databases/DatabaseDetailSidebar.tsx
+++ b/desktop/plugins/public/databases/DatabaseDetailSidebar.tsx
@@ -13,14 +13,17 @@ import {
   DetailSidebar,
   Panel,
   ManagedDataInspector,
-  Value,
-  valueToNullableString,
-  renderValue,
   styled,
   produce,
   colors,
 } from 'flipper';
 
+import {
+  Value,
+  valueToNullableString,
+  renderValue,
+} from './TypeBasedValueRenderer';
+
 import {Button} from 'antd';
 
 type TableRow = {
diff --git a/desktop/plugins/public/databases/DatabaseStructure.tsx b/desktop/plugins/public/databases/DatabaseStructure.tsx
index 5db3c4d36..6399761bd 100644
--- a/desktop/plugins/public/databases/DatabaseStructure.tsx
+++ b/desktop/plugins/public/databases/DatabaseStructure.tsx
@@ -7,7 +7,7 @@
  * @format
  */
 
-import {Value, renderValue} from 'flipper';
+import {Value, renderValue} from './TypeBasedValueRenderer';
 import {DataTable, DataTableColumn, Layout, useMemoize} from 'flipper-plugin';
 import React from 'react';
 import {Structure} from './index';
diff --git a/desktop/app/src/ui/components/table/TypeBasedValueRenderer.tsx b/desktop/plugins/public/databases/TypeBasedValueRenderer.tsx
similarity index 88%
rename from desktop/app/src/ui/components/table/TypeBasedValueRenderer.tsx
rename to desktop/plugins/public/databases/TypeBasedValueRenderer.tsx
index 854d88f78..fc9cd6cb2 100644
--- a/desktop/app/src/ui/components/table/TypeBasedValueRenderer.tsx
+++ b/desktop/plugins/public/databases/TypeBasedValueRenderer.tsx
@@ -8,10 +8,12 @@
  */
 
 import {default as styled} from '@emotion/styled';
-import {colors} from '../colors';
-import {default as Text} from '../Text';
+import {theme} from 'flipper-plugin';
+import {Typography} from 'antd';
 import React from 'react';
 
+const {Text} = Typography;
+
 export type Value =
   | {
       type: 'string' | 'blob';
@@ -52,7 +54,7 @@ const BooleanValue = styled(NonWrappingText)<{active?: boolean}>((props) => ({
     width: 8,
     height: 8,
     borderRadius: 4,
-    backgroundColor: props.active ? colors.green : colors.red,
+    backgroundColor: props.active ? theme.successColor : theme.errorColor,
     marginRight: 5,
     marginTop: 1,
   },
@@ -68,9 +70,7 @@ export function renderValue(val: Value, wordWrap?: boolean) {
   switch (val.type) {
     case 'boolean':
       return (
-        <BooleanValue code={true} active={val.value}>
-          {val.value.toString()}
-        </BooleanValue>
+        <BooleanValue active={val.value}>{val.value.toString()}</BooleanValue>
       );
     case 'blob':
     case 'string':
diff --git a/desktop/plugins/public/databases/UpdateQueryUtil.tsx b/desktop/plugins/public/databases/UpdateQueryUtil.tsx
index 35d977aa6..93d839cd7 100644
--- a/desktop/plugins/public/databases/UpdateQueryUtil.tsx
+++ b/desktop/plugins/public/databases/UpdateQueryUtil.tsx
@@ -7,7 +7,7 @@
  * @format
  */
 
-import {Value} from 'flipper';
+import {Value} from './TypeBasedValueRenderer';
 
 const INT_DATA_TYPE = ['INTEGER', 'LONG', 'INT', 'BIGINT'];
 const FLOAT_DATA_TYPE = ['REAL', 'DOUBLE'];
diff --git a/desktop/plugins/public/databases/__test__/DatabaseDetailSidebar.node.tsx b/desktop/plugins/public/databases/__test__/DatabaseDetailSidebar.node.tsx
index 3a245c616..6ae6b0e56 100644
--- a/desktop/plugins/public/databases/__test__/DatabaseDetailSidebar.node.tsx
+++ b/desktop/plugins/public/databases/__test__/DatabaseDetailSidebar.node.tsx
@@ -15,7 +15,7 @@ import reducers, {Store} from '../../../../app/src/reducers';
 import configureStore from 'redux-mock-store';
 import {Provider} from 'react-redux';
 
-import {Value} from 'flipper';
+import {Value} from '../TypeBasedValueRenderer';
 import DatabaseDetailSidebar from '../DatabaseDetailSidebar';
 
 const labels: Array<string> = [
diff --git a/desktop/plugins/public/databases/__test__/UpdateQueryUtil.node.tsx b/desktop/plugins/public/databases/__test__/UpdateQueryUtil.node.tsx
index b9837c44a..241460a66 100644
--- a/desktop/plugins/public/databases/__test__/UpdateQueryUtil.node.tsx
+++ b/desktop/plugins/public/databases/__test__/UpdateQueryUtil.node.tsx
@@ -7,7 +7,7 @@
  * @format
  */
 
-import {Value} from 'flipper';
+import {Value} from '../TypeBasedValueRenderer';
 import {
   isUpdatable,
   convertStringToValue,
diff --git a/desktop/app/src/ui/components/table/__test__/TypeBasedValueRenderer.node.tsx b/desktop/plugins/public/databases/__tests__/TypeBasedValueRenderer.node.tsx
similarity index 100%
rename from desktop/app/src/ui/components/table/__test__/TypeBasedValueRenderer.node.tsx
rename to desktop/plugins/public/databases/__tests__/TypeBasedValueRenderer.node.tsx
diff --git a/desktop/plugins/public/databases/index.tsx b/desktop/plugins/public/databases/index.tsx
index 0a182e18f..d548b1b95 100644
--- a/desktop/plugins/public/databases/index.tsx
+++ b/desktop/plugins/public/databases/index.tsx
@@ -16,10 +16,9 @@ import {
   TableRows,
   TableBodyRow,
   TableRowSortOrder,
-  renderValue,
   TableHighlightedRows,
-  Value,
 } from 'flipper';
+import {Value, renderValue} from './TypeBasedValueRenderer';
 import React, {KeyboardEvent, ChangeEvent, useState, useCallback} from 'react';
 import {Methods, Events} from './ClientProtocol';
 import ButtonNavigation from './ButtonNavigation';