diff --git a/package.json b/package.json
index 9aac3202..66c7bd39 100644
--- a/package.json
+++ b/package.json
@@ -38,14 +38,14 @@
     "bundle:standalone": "webpack --env.standalone --mode=production",
     "bundle:lib": "webpack --mode=production",
     "bundle": "npm run bundle:clean && npm run bundle:lib && npm run bundle:standalone",
-    "declarations": "rimraf typings && tsc --emitDeclarationOnly -p tsconfig.lib.json",
+    "declarations": "tsc --emitDeclarationOnly -p tsconfig.lib.json && cp -R src/types typings/",
     "stats": "webpack --env.standalone --json --profile --mode=production > stats.json",
     "prettier": "prettier --write \"src/**/*.{ts,tsx}\"",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1",
     "lint": "tslint --project tsconfig.json",
     "benchmark": "node ./benchmark/benchmark.js",
     "start:demo": "webpack-dev-server --hot --config demo/webpack.config.ts --mode=development",
-    "compile:cli": "tsc cli/index.ts --target es6 --module commonjs --types yargs",
+    "compile:cli": "tsc custom.d.ts cli/index.ts --target es6 --module commonjs --types yargs",
     "build:demo": "webpack --mode=production --config demo/webpack.config.ts",
     "deploy:demo": "npm run build:demo && deploy-to-gh-pages --update demo/dist",
     "license-check": "license-checker --production --onlyAllow 'MIT;ISC;Apache-2.0;BSD-2-Clause;BSD-3-Clause' --summary"
diff --git a/src/styled-components.ts b/src/styled-components.ts
index 78dfb015..a9dee9a9 100644
--- a/src/styled-components.ts
+++ b/src/styled-components.ts
@@ -21,10 +21,9 @@ const {
   injectGlobal,
   keyframes,
   ThemeProvider,
-  withTheme,
-} = (styledComponents as styledComponents.ThemedStyledComponentsModule<
-  any
->) as styledComponents.ThemedStyledComponentsModule<ResolvedThemeInterface>;
+} = (styledComponents as any) as styledComponents.ThemedStyledComponentsModule<
+  ResolvedThemeInterface
+>;
 
 export const media = {
   lessThan(breakpoint) {
@@ -54,6 +53,6 @@ export const media = {
   },
 };
 
-export { css, injectGlobal, keyframes, ThemeProvider, withTheme, withProps };
+export { css, injectGlobal, keyframes, ThemeProvider, withProps };
 export { StyledComponentClass } from 'styled-components';
 export default styled;