diff --git a/src/routes/ProcessGroupList.tsx b/src/routes/ProcessGroupList.tsx
index 1a5c59c..564a80d 100644
--- a/src/routes/ProcessGroupList.tsx
+++ b/src/routes/ProcessGroupList.tsx
@@ -3,11 +3,6 @@ import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import {
   Button,
   Table,
-  // ExpandableTile,
-  // TileAboveTheFoldContent,
-  // TileBelowTheFoldContent,
-  // TextInput,
-  // ClickableTile,
   // @ts-ignore
 } from '@carbon/react';
 import { Can } from '@casl/react';
diff --git a/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx b/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx
index 765fd7a..a3d225e 100644
--- a/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx
+++ b/src/themes/carbon/BaseInputTemplate/BaseInputTemplate.tsx
@@ -52,12 +52,16 @@ function BaseInputTemplate({
 
   const { schemaUtils } = registry;
   const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema);
+
   let labelToUse = label;
   if (uiSchema && uiSchema['ui:title']) {
     labelToUse = uiSchema['ui:title'];
   } else if (schema && schema.title) {
     labelToUse = schema.title;
   }
+  if (required) {
+    labelToUse = `${labelToUse}*`;
+  }
 
   return (
     <>
@@ -67,7 +71,6 @@ function BaseInputTemplate({
         placeholder={placeholder}
         labelText={displayLabel ? labelToUse : false}
         autoFocus={autofocus}
-        required={required}
         disabled={disabled || readonly}
         value={value || value === 0 ? value : ''}
         error={rawErrors.length > 0}
diff --git a/src/themes/carbon/MuiForm/MuiForm.tsx b/src/themes/carbon/CarbonForm/CarbonForm.tsx
similarity index 57%
rename from src/themes/carbon/MuiForm/MuiForm.tsx
rename to src/themes/carbon/CarbonForm/CarbonForm.tsx
index c57e97e..dfab951 100644
--- a/src/themes/carbon/MuiForm/MuiForm.tsx
+++ b/src/themes/carbon/CarbonForm/CarbonForm.tsx
@@ -3,6 +3,6 @@ import { withTheme, FormProps } from '@rjsf/core';
 
 import Theme from '../Theme';
 
-const MuiForm: ComponentType<FormProps> = withTheme(Theme);
+const CarbonForm: ComponentType<FormProps> = withTheme(Theme);
 
-export default MuiForm;
+export default CarbonForm;
diff --git a/src/themes/carbon/CarbonForm/index.ts b/src/themes/carbon/CarbonForm/index.ts
new file mode 100644
index 0000000..3b9f2d8
--- /dev/null
+++ b/src/themes/carbon/CarbonForm/index.ts
@@ -0,0 +1,2 @@
+export { default } from './CarbonForm';
+export * from './CarbonForm';
diff --git a/src/themes/carbon/MuiForm/index.ts b/src/themes/carbon/MuiForm/index.ts
deleted file mode 100644
index f4609de..0000000
--- a/src/themes/carbon/MuiForm/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default } from './MuiForm';
-export * from './MuiForm';
diff --git a/src/themes/carbon/SelectWidget/SelectWidget.tsx b/src/themes/carbon/SelectWidget/SelectWidget.tsx
index 0aadcbe..4da66bc 100644
--- a/src/themes/carbon/SelectWidget/SelectWidget.tsx
+++ b/src/themes/carbon/SelectWidget/SelectWidget.tsx
@@ -1,6 +1,5 @@
-import React from 'react';
-import MenuItem from '@mui/material/MenuItem';
-import TextField from '@mui/material/TextField';
+// @ts-ignore
+import { Select, SelectItem } from '@carbon/react';
 import { WidgetProps, processSelectValue } from '@rjsf/utils';
 
 function SelectWidget({
@@ -17,6 +16,7 @@ function SelectWidget({
   onChange,
   onBlur,
   onFocus,
+  uiSchema,
   rawErrors = [],
 }: WidgetProps) {
   const { enumOptions, enumDisabled } = options;
@@ -34,14 +34,23 @@ function SelectWidget({
   }: React.FocusEvent<HTMLInputElement>) =>
     onFocus(id, processSelectValue(schema, value, options));
 
+  let labelToUse = label;
+  if (uiSchema && uiSchema['ui:title']) {
+    labelToUse = uiSchema['ui:title'];
+  } else if (schema && schema.title) {
+    labelToUse = schema.title;
+  }
+  if (required) {
+    labelToUse = `${labelToUse}*`;
+  }
+
   return (
-    <TextField
+    <Select
       id={id}
       name={id}
-      label={label || schema.title}
+      labelText={labelToUse}
       select
       value={typeof value === 'undefined' ? emptyValue : value}
-      required={required}
       disabled={disabled || readonly}
       autoFocus={autofocus}
       error={rawErrors.length > 0}
@@ -58,13 +67,9 @@ function SelectWidget({
       {(enumOptions as any).map(({ value, label }: any, i: number) => {
         const disabled: any =
           enumDisabled && (enumDisabled as any).indexOf(value) != -1;
-        return (
-          <MenuItem key={i} value={value} disabled={disabled}>
-            {label}
-          </MenuItem>
-        );
+        return <SelectItem text={label} value={value} disabled={disabled} />;
       })}
-    </TextField>
+    </Select>
   );
 }
 
diff --git a/src/themes/carbon/index.ts b/src/themes/carbon/index.ts
index cc3d225..0c96cf2 100644
--- a/src/themes/carbon/index.ts
+++ b/src/themes/carbon/index.ts
@@ -1,9 +1,9 @@
-import MuiForm from './MuiForm/MuiForm';
+import CarbonForm from './CarbonForm/CarbonForm';
 import './index.css';
 
-export { default as Form } from './MuiForm';
+export { default as Form } from './CarbonForm';
 export { default as Templates } from './Templates';
 export { default as Theme } from './Theme';
 export { default as Widgets } from './Widgets';
 
-export default MuiForm;
+export default CarbonForm;