diff --git a/lib/api.dart b/lib/api.dart
index d0f35a2b..7058e9eb 100644
--- a/lib/api.dart
+++ b/lib/api.dart
@@ -8,7 +8,6 @@ import "package:intl/intl.dart";
 import "package:inventree/app_colors.dart";
 
 import "package:open_file/open_file.dart";
-import "package:flutter/cupertino.dart";
 import "package:cached_network_image/cached_network_image.dart";
 import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
diff --git a/lib/api_form.dart b/lib/api_form.dart
index 5b28f5e4..252b5ee5 100644
--- a/lib/api_form.dart
+++ b/lib/api_form.dart
@@ -17,7 +17,6 @@ import "package:inventree/widget/dialogs.dart";
 import "package:inventree/widget/fields.dart";
 import "package:inventree/l10.dart";
 
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:inventree/widget/snacks.dart";
 
diff --git a/lib/barcode.dart b/lib/barcode.dart
index bc313288..4fd23f38 100644
--- a/lib/barcode.dart
+++ b/lib/barcode.dart
@@ -3,7 +3,6 @@ import "dart:io";
 import "package:inventree/inventree/sentry.dart";
 import "package:inventree/widget/dialogs.dart";
 import "package:inventree/widget/snacks.dart";
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:one_context/one_context.dart";
diff --git a/lib/inventree/model.dart b/lib/inventree/model.dart
index 116b2e08..c39da8fe 100644
--- a/lib/inventree/model.dart
+++ b/lib/inventree/model.dart
@@ -3,7 +3,7 @@ import "dart:io";
 
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:inventree/api.dart";
-import "package:flutter/cupertino.dart";
+import "package:flutter/material.dart";
 import "package:inventree/inventree/sentry.dart";
 import "package:inventree/widget/dialogs.dart";
 import "package:url_launcher/url_launcher.dart";
diff --git a/lib/inventree/part.dart b/lib/inventree/part.dart
index e327cb9c..7a625a35 100644
--- a/lib/inventree/part.dart
+++ b/lib/inventree/part.dart
@@ -3,10 +3,11 @@ import "dart:io";
 import "package:inventree/api.dart";
 import "package:inventree/inventree/stock.dart";
 import "package:inventree/inventree/company.dart";
-import "package:flutter/cupertino.dart";
+import "package:flutter/material.dart";
 import "package:inventree/l10.dart";
 
-import "model.dart";
+import "package:inventree/inventree/model.dart";
+
 
 class InvenTreePartCategory extends InvenTreeModel {
 
diff --git a/lib/inventree/stock.dart b/lib/inventree/stock.dart
index 79d9fa5d..45808d2d 100644
--- a/lib/inventree/stock.dart
+++ b/lib/inventree/stock.dart
@@ -4,7 +4,6 @@ import "package:flutter/material.dart";
 import "package:intl/intl.dart";
 import "package:inventree/helpers.dart";
 import "package:inventree/inventree/part.dart";
-import "package:flutter/cupertino.dart";
 
 import "package:inventree/inventree/model.dart";
 import "package:inventree/l10.dart";
diff --git a/lib/main.dart b/lib/main.dart
index cb008ac4..cd881364 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -3,11 +3,9 @@ import "dart:async";
 import "package:flutter_localizations/flutter_localizations.dart";
 import "package:flutter_gen/gen_l10n/app_localizations.dart";
 
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:one_context/one_context.dart";
 import "package:package_info_plus/package_info_plus.dart";
-import "package:flutter/foundation.dart";
 import "package:sentry_flutter/sentry_flutter.dart";
 
 import "package:inventree/inventree/sentry.dart";
diff --git a/lib/settings/about.dart b/lib/settings/about.dart
index 4a4036d8..13af3c35 100644
--- a/lib/settings/about.dart
+++ b/lib/settings/about.dart
@@ -2,7 +2,6 @@ import "package:inventree/api.dart";
 import "package:inventree/app_colors.dart";
 import "package:inventree/settings/release.dart";
 
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
diff --git a/lib/settings/app_settings.dart b/lib/settings/app_settings.dart
index 46306bbe..be86c7bf 100644
--- a/lib/settings/app_settings.dart
+++ b/lib/settings/app_settings.dart
@@ -1,13 +1,11 @@
 
 import "package:flutter/material.dart";
-import "package:flutter/cupertino.dart";
-
-import "package:inventree/l10.dart";
-
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 
+import "package:inventree/l10.dart";
 import "package:inventree/app_settings.dart";
 
+
 class InvenTreeAppSettingsWidget extends StatefulWidget {
   @override
   _InvenTreeAppSettingsState createState() => _InvenTreeAppSettingsState();
diff --git a/lib/settings/home_settings.dart b/lib/settings/home_settings.dart
index 42bbb10d..7b93f40c 100644
--- a/lib/settings/home_settings.dart
+++ b/lib/settings/home_settings.dart
@@ -1,6 +1,5 @@
 
 import "package:flutter/material.dart";
-import "package:flutter/cupertino.dart";
 
 import "package:inventree/l10.dart";
 
diff --git a/lib/settings/release.dart b/lib/settings/release.dart
index 35e60a44..b04b1eb8 100644
--- a/lib/settings/release.dart
+++ b/lib/settings/release.dart
@@ -1,4 +1,3 @@
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:flutter_markdown/flutter_markdown.dart";
 import "package:inventree/l10.dart";
diff --git a/lib/widget/back.dart b/lib/widget/back.dart
index be3ade92..04f03255 100644
--- a/lib/widget/back.dart
+++ b/lib/widget/back.dart
@@ -4,7 +4,6 @@
  * Long-pressing on this will return the user to the home screen
  */
 
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 Widget backButton(BuildContext context, GlobalKey<ScaffoldState> key) {
diff --git a/lib/widget/category_display.dart b/lib/widget/category_display.dart
index d0c883e2..8cd5081b 100644
--- a/lib/widget/category_display.dart
+++ b/lib/widget/category_display.dart
@@ -1,5 +1,3 @@
-import "package:flutter/cupertino.dart";
-import "package:flutter/foundation.dart";
 import "package:flutter/material.dart";
 
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
diff --git a/lib/widget/category_list.dart b/lib/widget/category_list.dart
index 33673d6c..8bb24653 100644
--- a/lib/widget/category_list.dart
+++ b/lib/widget/category_list.dart
@@ -1,4 +1,3 @@
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 import "package:inventree/inventree/model.dart";
diff --git a/lib/widget/company_detail.dart b/lib/widget/company_detail.dart
index b0ad3254..b7ac259e 100644
--- a/lib/widget/company_detail.dart
+++ b/lib/widget/company_detail.dart
@@ -5,7 +5,6 @@ import "package:inventree/inventree/company.dart";
 import "package:inventree/inventree/purchase_order.dart";
 import "package:inventree/widget/purchase_order_list.dart";
 import "package:inventree/widget/refreshable_state.dart";
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:inventree/l10.dart";
diff --git a/lib/widget/company_list.dart b/lib/widget/company_list.dart
index c2bb5996..1496826f 100644
--- a/lib/widget/company_list.dart
+++ b/lib/widget/company_list.dart
@@ -1,5 +1,4 @@
 
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 import "package:inventree/api.dart";
diff --git a/lib/widget/dialogs.dart b/lib/widget/dialogs.dart
index e5a1e8d9..357983b2 100644
--- a/lib/widget/dialogs.dart
+++ b/lib/widget/dialogs.dart
@@ -2,7 +2,6 @@
 import "package:inventree/app_settings.dart";
 import "package:inventree/widget/snacks.dart";
 import "package:audioplayers/audioplayers.dart";
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:inventree/l10.dart";
diff --git a/lib/widget/home.dart b/lib/widget/home.dart
index 237e2766..bc415e91 100644
--- a/lib/widget/home.dart
+++ b/lib/widget/home.dart
@@ -1,4 +1,3 @@
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
@@ -19,7 +18,7 @@ import "package:inventree/widget/search.dart";
 import "package:inventree/widget/snacks.dart";
 import "package:inventree/widget/drawer.dart";
 
-import "../app_settings.dart";
+import "package:inventree/app_settings.dart";
 
 
 class InvenTreeHomePage extends StatefulWidget {
diff --git a/lib/widget/location_display.dart b/lib/widget/location_display.dart
index 0c2fd3a3..b99c8077 100644
--- a/lib/widget/location_display.dart
+++ b/lib/widget/location_display.dart
@@ -1,6 +1,4 @@
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
-import "package:flutter/foundation.dart";
 
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 
diff --git a/lib/widget/location_list.dart b/lib/widget/location_list.dart
index b766ca08..42c87920 100644
--- a/lib/widget/location_list.dart
+++ b/lib/widget/location_list.dart
@@ -1,4 +1,3 @@
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 import "package:inventree/inventree/model.dart";
diff --git a/lib/widget/part_attachments_widget.dart b/lib/widget/part_attachments_widget.dart
index 29c32e6c..5fada013 100644
--- a/lib/widget/part_attachments_widget.dart
+++ b/lib/widget/part_attachments_widget.dart
@@ -1,6 +1,5 @@
 import "dart:io";
 
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:inventree/inventree/part.dart";
diff --git a/lib/widget/part_detail.dart b/lib/widget/part_detail.dart
index 40c5ce4a..2a6d43f3 100644
--- a/lib/widget/part_detail.dart
+++ b/lib/widget/part_detail.dart
@@ -1,6 +1,3 @@
-
-import "package:flutter/cupertino.dart";
-import "package:flutter/foundation.dart";
 import "package:flutter/material.dart";
 
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
diff --git a/lib/widget/part_image_widget.dart b/lib/widget/part_image_widget.dart
index e9ed62e4..a582dce2 100644
--- a/lib/widget/part_image_widget.dart
+++ b/lib/widget/part_image_widget.dart
@@ -1,7 +1,5 @@
 import "dart:io";
 
-import "package:flutter/cupertino.dart";
-import "package:flutter/foundation.dart";
 import "package:flutter/material.dart";
 
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
diff --git a/lib/widget/part_notes.dart b/lib/widget/part_notes.dart
index 717a8fe5..6ceb23e6 100644
--- a/lib/widget/part_notes.dart
+++ b/lib/widget/part_notes.dart
@@ -3,7 +3,6 @@ import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:inventree/api.dart";
 import "package:inventree/inventree/part.dart";
 import "package:inventree/widget/refreshable_state.dart";
-import "package:flutter/cupertino.dart";
 import "package:flutter_markdown/flutter_markdown.dart";
 import "package:inventree/l10.dart";
 
diff --git a/lib/widget/part_suppliers.dart b/lib/widget/part_suppliers.dart
index a69d5f22..9b1a2789 100644
--- a/lib/widget/part_suppliers.dart
+++ b/lib/widget/part_suppliers.dart
@@ -4,7 +4,6 @@ import "package:inventree/l10.dart";
 
 import "package:inventree/api.dart";
 
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:inventree/inventree/part.dart";
 import "package:inventree/inventree/company.dart";
diff --git a/lib/widget/purchase_order_detail.dart b/lib/widget/purchase_order_detail.dart
index 27a47bd3..2a657ec0 100644
--- a/lib/widget/purchase_order_detail.dart
+++ b/lib/widget/purchase_order_detail.dart
@@ -1,4 +1,3 @@
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
diff --git a/lib/widget/purchase_order_list.dart b/lib/widget/purchase_order_list.dart
index d1a107c9..43f24ea6 100644
--- a/lib/widget/purchase_order_list.dart
+++ b/lib/widget/purchase_order_list.dart
@@ -1,4 +1,3 @@
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 import "package:inventree/inventree/company.dart";
diff --git a/lib/widget/refreshable_state.dart b/lib/widget/refreshable_state.dart
index 9d6fe21b..fe318caa 100644
--- a/lib/widget/refreshable_state.dart
+++ b/lib/widget/refreshable_state.dart
@@ -1,8 +1,6 @@
 import "package:inventree/widget/back.dart";
 import "package:inventree/widget/drawer.dart";
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
-import "package:flutter/widgets.dart";
 
 
 abstract class RefreshableState<T extends StatefulWidget> extends State<T> {
diff --git a/lib/widget/search.dart b/lib/widget/search.dart
index 387eb8f3..77258d43 100644
--- a/lib/widget/search.dart
+++ b/lib/widget/search.dart
@@ -1,6 +1,5 @@
 import "dart:async";
 
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
diff --git a/lib/widget/snacks.dart b/lib/widget/snacks.dart
index fdbeb1c0..e6ee8644 100644
--- a/lib/widget/snacks.dart
+++ b/lib/widget/snacks.dart
@@ -8,7 +8,6 @@
  * | Text          <icon> |
  */
 
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:one_context/one_context.dart";
diff --git a/lib/widget/spinner.dart b/lib/widget/spinner.dart
index faebe750..5e9d598d 100644
--- a/lib/widget/spinner.dart
+++ b/lib/widget/spinner.dart
@@ -1,5 +1,4 @@
 import "package:flutter/material.dart";
-import "package:flutter/cupertino.dart";
 
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:inventree/app_colors.dart";
diff --git a/lib/widget/starred_parts.dart b/lib/widget/starred_parts.dart
index a96977c5..e667a94c 100644
--- a/lib/widget/starred_parts.dart
+++ b/lib/widget/starred_parts.dart
@@ -2,7 +2,6 @@ import "package:inventree/inventree/part.dart";
 import "package:inventree/widget/part_detail.dart";
 import "package:inventree/widget/progress.dart";
 import "package:inventree/widget/refreshable_state.dart";
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 import "package:inventree/l10.dart";
diff --git a/lib/widget/stock_detail.dart b/lib/widget/stock_detail.dart
index 389abfe5..3b400b26 100644
--- a/lib/widget/stock_detail.dart
+++ b/lib/widget/stock_detail.dart
@@ -1,4 +1,3 @@
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 import "package:dropdown_search/dropdown_search.dart";
diff --git a/lib/widget/stock_item_history.dart b/lib/widget/stock_item_history.dart
index f4c5afe3..c2284c0f 100644
--- a/lib/widget/stock_item_history.dart
+++ b/lib/widget/stock_item_history.dart
@@ -1,6 +1,3 @@
-
-
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 import "package:inventree/widget/refreshable_state.dart";
diff --git a/lib/widget/stock_item_test_results.dart b/lib/widget/stock_item_test_results.dart
index 933286a2..df34bb67 100644
--- a/lib/widget/stock_item_test_results.dart
+++ b/lib/widget/stock_item_test_results.dart
@@ -7,7 +7,6 @@ import "package:inventree/widget/progress.dart";
 
 import "package:inventree/l10.dart";
 
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:inventree/widget/refreshable_state.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
diff --git a/lib/widget/stock_list.dart b/lib/widget/stock_list.dart
index f34a87f5..b78cdf18 100644
--- a/lib/widget/stock_list.dart
+++ b/lib/widget/stock_list.dart
@@ -1,5 +1,3 @@
-
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 
 import "package:inventree/inventree/model.dart";
@@ -11,6 +9,7 @@ import "package:inventree/app_settings.dart";
 import "package:inventree/widget/stock_detail.dart";
 import "package:inventree/api.dart";
 
+
 class StockItemList extends StatefulWidget {
 
   const StockItemList(this.filters);
diff --git a/lib/widget/stock_notes.dart b/lib/widget/stock_notes.dart
index 3e6f4f93..05cc405b 100644
--- a/lib/widget/stock_notes.dart
+++ b/lib/widget/stock_notes.dart
@@ -3,7 +3,6 @@ import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:inventree/inventree/stock.dart";
 import "package:inventree/widget/refreshable_state.dart";
-import "package:flutter/cupertino.dart";
 import "package:flutter_markdown/flutter_markdown.dart";
 import "package:inventree/l10.dart";
 
diff --git a/lib/widget/submit_feedback.dart b/lib/widget/submit_feedback.dart
index 201929c3..6a94bf1c 100644
--- a/lib/widget/submit_feedback.dart
+++ b/lib/widget/submit_feedback.dart
@@ -1,4 +1,3 @@
-import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:inventree/inventree/sentry.dart";