diff --git a/packages/tinacms-condition-field/package.json b/packages/tinacms-condition-field/package.json
index ac48791..dfb0ef1 100644
--- a/packages/tinacms-condition-field/package.json
+++ b/packages/tinacms-condition-field/package.json
@@ -21,11 +21,10 @@
     "react-scripts": "^3.4.1"
   },
   "peerDependencies": {
-    "@tinacms/form-builder": "^0.3.0",
+    "@tinacms/toolkit": "^0.52.3",
     "prop-types": "^15.5.4",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
-    "tinacms": "^0.18.0"
   },
   "files": [
     "dist"
diff --git a/packages/tinacms-condition-field/src/components/condition.js b/packages/tinacms-condition-field/src/components/condition.js
index 907a605..4d5df05 100644
--- a/packages/tinacms-condition-field/src/components/condition.js
+++ b/packages/tinacms-condition-field/src/components/condition.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import styled from 'styled-components';
-import { FieldsBuilder } from '@tinacms/form-builder';
+import { FieldsBuilder } from '@tinacms/toolkit';
 
 const Condition = ({ input, field, form }) => {
   const nestedFields = field.fields(input.value);
diff --git a/packages/tinacms-file-field/package.json b/packages/tinacms-file-field/package.json
index b5705ff..6336ac8 100644
--- a/packages/tinacms-file-field/package.json
+++ b/packages/tinacms-file-field/package.json
@@ -22,10 +22,10 @@
     "react-scripts": "^3.4.1"
   },
   "peerDependencies": {
+    "@tinacms/toolkit": "^0.52.3",
     "prop-types": "^15.5.4",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
-    "tinacms": "^0.18.0"
   },
   "files": [
     "dist"
diff --git a/packages/tinacms-file-field/src/components/file-upload.js b/packages/tinacms-file-field/src/components/file-upload.js
index 20198b7..f9753b1 100644
--- a/packages/tinacms-file-field/src/components/file-upload.js
+++ b/packages/tinacms-file-field/src/components/file-upload.js
@@ -2,8 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
 import { useDropzone } from 'react-dropzone';
-import { IconButton } from '@tinacms/styles';
-import { TrashIcon } from '@tinacms/icons';
+import { IconButton } from '@tinacms/toolkit';
+import { TrashIcon } from '@tinacms/toolkit';
 import AttachmentIcon from './attachment-icon';
 
 const DropArea = styled.div`
diff --git a/packages/tinacms-file-field/src/components/file.js b/packages/tinacms-file-field/src/components/file.js
index a05c104..a55fc5b 100644
--- a/packages/tinacms-file-field/src/components/file.js
+++ b/packages/tinacms-file-field/src/components/file.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { useCMS } from 'tinacms';
+import { useCMS } from '@tinacms/toolkit';
 import styled, { css } from 'styled-components';
 import FileUpload from './file-upload';
 
diff --git a/packages/tinacms-relation-field/package.json b/packages/tinacms-relation-field/package.json
index 344c539..5fc85bf 100644
--- a/packages/tinacms-relation-field/package.json
+++ b/packages/tinacms-relation-field/package.json
@@ -21,11 +21,10 @@
     "react-scripts": "^3.4.1"
   },
   "peerDependencies": {
-    "@tinacms/form-builder": "^0.3.0",
+    "@tinacms/toolkit": "^0.52.3",
     "prop-types": "^15.5.4",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
-    "tinacms": "^0.18.0"
   },
   "files": [
     "dist"
diff --git a/packages/tinacms-relation-field/src/components/multiple-relations.js b/packages/tinacms-relation-field/src/components/multiple-relations.js
index f6ff267..360f64a 100644
--- a/packages/tinacms-relation-field/src/components/multiple-relations.js
+++ b/packages/tinacms-relation-field/src/components/multiple-relations.js
@@ -4,10 +4,10 @@ import styled, { css } from 'styled-components';
 import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
 import {
   AddIcon, DragIcon, ReorderIcon, TrashIcon,
-} from '@tinacms/icons';
+} from '@tinacms/toolkit';
 import {
   IconButton,
-} from '@tinacms/styles';
+} from '@tinacms/toolkit';
 import { FormHeader, FormBody, FieldLabel } from './form';
 
 const MultipleRelations = ({ input, field, form }) => {