diff --git a/docs/src/routes/Components/ListView/SimpleExample.tsx b/docs/src/routes/Components/ListView/SimpleExample.tsx
index 0f7e2fbe..4bf99a90 100644
--- a/docs/src/routes/Components/ListView/SimpleExample.tsx
+++ b/docs/src/routes/Components/ListView/SimpleExample.tsx
@@ -1,13 +1,13 @@
 import * as React from "react";
 import * as PropTypes from "prop-types";
 
-import ListView, { ListViewProps, ListItem } from "react-uwp/ListView";
+import ListView, { ListViewProps } from "react-uwp/ListView";
 import Separator from "react-uwp/Separator";
 import CheckBox from "react-uwp/CheckBox";
 import Toggle from "react-uwp/Toggle";
 import Icon from "react-uwp/Icon";
 
-const listSource: ListItem[] = [{
+const listSource = [{
   itemNode: <p>Text</p>
 }, {
   itemNode: <Separator />,
diff --git a/docs/src/routes/Components/TreeView/SimpleExample.tsx b/docs/src/routes/Components/TreeView/SimpleExample.tsx
index 45b39252..41b71a8e 100644
--- a/docs/src/routes/Components/TreeView/SimpleExample.tsx
+++ b/docs/src/routes/Components/TreeView/SimpleExample.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as PropTypes from "prop-types";
 
-import TreeView from "react-uwp/TreeView";
+import TreeView, { TreeItem } from "react-uwp/TreeView";
 import Icon from "react-uwp/Icon";
 import CheckBox from "react-uwp/CheckBox";
 import Toggle from "react-uwp/Toggle";
@@ -95,7 +95,7 @@ export default class SimpleExample extends React.Component<{}, SimpleExampleStat
           }, {
             title: "D",
             disabled: true
-          }]}
+          }] as TreeItem[]}
           showFocus
           background={theme.useFluentDesign ? (
             theme.acrylicTexture40.background
diff --git a/src/CheckBox/index.tsx b/src/CheckBox/index.tsx
index c6508323..1af08145 100644
--- a/src/CheckBox/index.tsx
+++ b/src/CheckBox/index.tsx
@@ -172,7 +172,10 @@ function getStyles(checkBox: CheckBox): {
     overflow: "hidden"
   });
   const iconParentHoverStyle = { border: `2px solid ${theme.baseHigh}` };
-  let iconParent: React.CSSProperties;
+  let iconParent: {
+    style: React.CSSProperties;
+    hoverStyle: React.CSSProperties;
+  };
 
   switch (checked) {
     case true: {
diff --git a/src/Icon/index.tsx b/src/Icon/index.tsx
index ecd65490..3550d034 100644
--- a/src/Icon/index.tsx
+++ b/src/Icon/index.tsx
@@ -71,7 +71,7 @@ export class Icon extends React.Component<IconProps, IconState> {
     } = this.props;
     const { theme } = this.context;
     const { hovered } = this.state;
-    return React.createElement(useSVGElement ? "text" : "span", {
+    return React.createElement(useSVGElement ? "text" as "span" : "span", {
       ...attributes,
       onMouseEnter: this.handleMouseEnter,
       onMouseLeave: this.handleMouseLeave,
diff --git a/src/TreeView/index.tsx b/src/TreeView/index.tsx
index e1b97f5d..b085ee76 100644
--- a/src/TreeView/index.tsx
+++ b/src/TreeView/index.tsx
@@ -276,7 +276,7 @@ export class TreeView extends React.Component<TreeViewProps, TreeViewState> {
                 transition: "all .25s"
               })}
             >
-              {expanded && children.map((item: TreeItem[], index: number) => renderList(item, index, true, indexArray))}
+              {expanded && children.map((item: TreeItem, index: number) => renderList(item, index, true, indexArray))}
             </div>
           )}
         </div>
diff --git a/src/styles/darkTheme.ts b/src/styles/darkTheme.ts
index 54e31681..9130a771 100644
--- a/src/styles/darkTheme.ts
+++ b/src/styles/darkTheme.ts
@@ -1,2 +1,2 @@
 import getTheme from "./getTheme";
-export default getTheme("dark");
+export default getTheme({ themeName: "dark" });
diff --git a/src/styles/lightTheme.ts b/src/styles/lightTheme.ts
index 3576f850..4412c2f5 100644
--- a/src/styles/lightTheme.ts
+++ b/src/styles/lightTheme.ts
@@ -1,3 +1,3 @@
 import getTheme from "./getTheme";
 
-export default getTheme("light");
+export default getTheme({ themeName: "dark" });