diff --git a/packages/devui/src/Select/Select.tsx b/packages/devui/src/Select/Select.tsx
index 75324b63..465ccb52 100644
--- a/packages/devui/src/Select/Select.tsx
+++ b/packages/devui/src/Select/Select.tsx
@@ -38,6 +38,11 @@ export class Select extends (PureComponent || Component)<SelectProps> {
             neutral60: this.props.theme.base06,
             neutral80: this.props.theme.base07,
           },
+          spacing: {
+            ...theme.spacing,
+            baseUnit: 2,
+            controlHeight: this.props.theme.inputHeight,
+          },
         })}
       />
     );
diff --git a/packages/devui/src/utils/createThemedComponent.tsx b/packages/devui/src/utils/createThemedComponent.tsx
index 2ec64b42..e630cdc3 100644
--- a/packages/devui/src/utils/createThemedComponent.tsx
+++ b/packages/devui/src/utils/createThemedComponent.tsx
@@ -14,7 +14,7 @@ export default <C extends React.ComponentType<any>>(
     ) : (
       <UnthemedComponent
         {...props}
-        theme={getDefaultTheme({} as Base16Theme)}
+        theme={getDefaultTheme((props.theme ?? {}) as Base16Theme)}
       />
     );
   });
diff --git a/packages/redux-devtools-test-generator/src/index.tsx b/packages/redux-devtools-test-generator/src/index.tsx
index 64cc5f50..3243c6ec 100644
--- a/packages/redux-devtools-test-generator/src/index.tsx
+++ b/packages/redux-devtools-test-generator/src/index.tsx
@@ -133,9 +133,9 @@ export default class TestTab<S, A extends Action<unknown>> extends Component<
           <div style={{ flexGrow: 1, zIndex: 100 }}>
             <Select
               options={templates}
-              getValueLabel={(template: Template) => template.name}
+              getOptionValue={(template: Template) => template.name}
               getOptionLabel={(template: Template) => template.name}
-              value={templates.filter((template) => template.name == name)}
+              value={templates.filter((template) => template.name === name)}
               onChange={this.handleSelectTemplate}
             />
           </div>
diff --git a/yarn.lock b/yarn.lock
index ceeea8f7..8b678689 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9357,7 +9357,7 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==