diff --git a/build/rollup.config.js b/build/rollup.config.js
index 10476d27..4a1ec3c2 100644
--- a/build/rollup.config.js
+++ b/build/rollup.config.js
@@ -7,6 +7,7 @@ import commonjs from 'rollup-plugin-commonjs'
 import copy from 'rollup-plugin-copy'
 import { terser } from 'rollup-plugin-terser'
 import del from 'rollup-plugin-delete'
+import multiInput from 'rollup-plugin-multi-input'
 
 const external = [
   ...Object.keys(pkg.dependencies || {}),
@@ -15,20 +16,23 @@ const external = [
 ]
 
 export default {
-  input: 'src/index.ts',
-  output: [
-    {
-      name: 'SoramitsuJsUi',
-      file: 'lib/soramitsu-js-ui.esm.js',
-      format: 'esm',
-      sourcemap: true
-    }, {
-      name: 'SoramitsuJsUiUmd',
-      format: 'umd',
-      file: 'lib/soramitsu-js-ui.umd.js',
-      sourcemap: true
-    }
+  input: [
+    'src/index.ts',
+    'src/types/DesignSystem.ts',
+    'src/types/Locale.ts',
+    'src/types/Theme.ts',
+    'src/locale/index.ts',
+    'src/plugins/*.ts',
+    'src/store/index.ts',
+    'src/utils/*.ts',
+    'src/directives/index.ts',
+    'src/components/*/**/index.ts'
   ],
+  output: {
+    format: 'esm',
+    dir: 'lib'
+    // sourcemap: true We don't need it because of d.ts files
+  },
   external (id) {
     return external.includes(id.split('/')[0]) ||
       /element-ui\/lib\//.test(id)
@@ -52,6 +56,9 @@ export default {
         { src: 'src/styles/neumorphism/*', dest: 'lib/styles/neumorphism' }
       ]
     }),
+    multiInput({
+      relative: 'src/'
+    }),
     typescript({
       typescript: require('typescript'),
       objectHashIgnoreUnknownHack: true,
@@ -69,7 +76,19 @@ export default {
     resolve(),
     terser(),
     del({
-      targets: ['lib/styles/index.d.ts', 'lib/soramitsu-js-ui.esm.css'],
+      targets: [
+        'lib/styles/index.d.ts',
+        'bundle.css'
+        // TODO: find a way how to remove this dependencies
+        // 'lib/BorderRadiusMixin-**.js',
+        // 'lib/SizeMixin-**.js',
+        // 'lib/DesignSystem-**.js',
+        // 'lib/DesignSystemInject-**.js',
+        // 'lib/normalize-component-**.js',
+        // 'lib/components-**.js',
+        // 'lib/consts-**.js',
+        // 'lib/index-**.js'
+      ],
       hook: 'writeBundle'
     })
   ]
diff --git a/package.json b/package.json
index 004bd2a7..5d4254a9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@soramitsu/soramitsu-js-ui",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "private": false,
   "publishConfig": {
     "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/"
@@ -13,9 +13,9 @@
     }
   ],
   "author": "Stefan Popov <popov@soramitsu.co.jp>",
-  "main": "./lib/soramitsu-js-ui.umd.js",
-  "module": "./lib/soramitsu-js-ui.esm.js",
-  "unpkg": "./lib/soramitsu-js-ui.min.js",
+  "main": "./lib/index.js",
+  "module": "./lib/index.js",
+  "unpkg": "./lib/index.js",
   "typings": "./lib/index.d.ts",
   "scripts": {
     "build": "rm -rf lib && rollup -c ./build/rollup.config.js",
@@ -75,6 +75,7 @@
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-copy": "^3.4.0",
     "rollup-plugin-delete": "^1.1.0",
+    "rollup-plugin-multi-input": "^1.3.1",
     "rollup-plugin-scss": "^2.5.0",
     "rollup-plugin-terser": "^5.1.2",
     "rollup-plugin-typescript2": "^0.25.2",
@@ -94,7 +95,6 @@
   },
   "files": [
     "lib/*",
-    "src/*",
     "*.json",
     "*.js"
   ],
diff --git a/src/components/Card/SCard/SCard.vue b/src/components/Card/SCard/SCard.vue
index 1c3f1af4..4bd10c18 100644
--- a/src/components/Card/SCard/SCard.vue
+++ b/src/components/Card/SCard/SCard.vue
@@ -20,7 +20,6 @@ import BorderRadiusMixin from '../../../mixins/BorderRadiusMixin'
 import SizeMixin from '../../../mixins/SizeMixin'
 import StatusMixin from '../../../mixins/StatusMixin'
 import { CardShadow } from '../consts'
-import { BorderRadius } from '../../../types'
 
 @Component({
   components: { ElCard }
@@ -48,8 +47,6 @@ export default class SCard extends Mixins(BorderRadiusMixin, SizeMixin, StatusMi
    * `false` by default
    */
   @Prop({ default: false, type: Boolean }) readonly clickable!: boolean
-
-  @Prop({ default: BorderRadius.MEDIUM }) borderRadius!: string
   /**
    * Does card should looks like it's under surface (inner shadow)
    */
diff --git a/src/components/DesignSystem/DesignSystemInject.ts b/src/components/DesignSystem/DesignSystemInject.ts
index 6adbb16f..24ca84cd 100644
--- a/src/components/DesignSystem/DesignSystemInject.ts
+++ b/src/components/DesignSystem/DesignSystemInject.ts
@@ -1,6 +1,6 @@
 import { Component, Vue, Inject, Prop } from 'vue-property-decorator'
 import { DesignSystemProvideKey } from './consts'
-import { DesignSystem } from '../../utils/DesignSystem'
+import DesignSystem from '../../types/DesignSystem'
 
 @Component
 export default class DesignSystemInject extends Vue {
diff --git a/src/components/DesignSystem/SDesignSystemProvider/SDesignSystemProvider.vue b/src/components/DesignSystem/SDesignSystemProvider/SDesignSystemProvider.vue
index 8c353bea..57e40ce8 100644
--- a/src/components/DesignSystem/SDesignSystemProvider/SDesignSystemProvider.vue
+++ b/src/components/DesignSystem/SDesignSystemProvider/SDesignSystemProvider.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { Component, Vue, Prop, Provide, Watch } from 'vue-property-decorator'
 import { DesignSystemProvideKey } from '../consts'
-import { DesignSystem } from '../../../utils/DesignSystem'
+import DesignSystem from '../../../types/DesignSystem'
 
 @Component
 export default class SDesignSystemProvider extends Vue {
diff --git a/src/components/DesignSystem/consts.ts b/src/components/DesignSystem/consts.ts
index 5f3fa1f6..ec9d3ee5 100644
--- a/src/components/DesignSystem/consts.ts
+++ b/src/components/DesignSystem/consts.ts
@@ -1,6 +1 @@
 export const DesignSystemProvideKey = 'designSystem'
-
-export enum DesignSystem {
-  DEFAULT = '',
-  NEUMORPHIC = 'neumorphic'
-}
diff --git a/src/components/Switch/SSwitch.vue b/src/components/Switch/SSwitch.vue
index 127743fe..d163a4fd 100644
--- a/src/components/Switch/SSwitch.vue
+++ b/src/components/Switch/SSwitch.vue
@@ -19,6 +19,7 @@
 <script lang="ts">
 import { Mixins, Component, Prop, Watch } from 'vue-property-decorator'
 import ElSwitch from 'element-ui/lib/switch'
+
 import DesignSystemInject from '../DesignSystem/DesignSystemInject'
 
 @Component({
diff --git a/src/components/Tooltip/STooltip.vue b/src/components/Tooltip/STooltip.vue
index 85f8deaa..78216257 100644
--- a/src/components/Tooltip/STooltip.vue
+++ b/src/components/Tooltip/STooltip.vue
@@ -30,7 +30,7 @@ import ElTooltip from 'element-ui/lib/tooltip'
 
 import DesignSystemInject from '../DesignSystem/DesignSystemInject'
 import BorderRadiusMixin from '../../mixins/BorderRadiusMixin'
-import { Theme } from '../../utils/Theme'
+import Theme from '../../types/Theme'
 import { TooltipTheme, TooltipPlacement } from './consts'
 
 @Component({
diff --git a/src/directives/number.ts b/src/directives/number.ts
index 4fbf1122..637e476c 100644
--- a/src/directives/number.ts
+++ b/src/directives/number.ts
@@ -1,6 +1,6 @@
 import { DirectiveOptions } from 'vue'
 
-import { KeyValues } from '../utils/KeyValues'
+import KeyValues from '../utils/KeyValues'
 
 const onDigitKeyPress = (e: any) => {
   if (!KeyValues.isDigit(e.key)) {
diff --git a/src/index.ts b/src/index.ts
index b32b63a6..9af4aa09 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -54,9 +54,9 @@ import { Float, Integer } from './directives'
 import { Components } from './types/components'
 import { Directives } from './types/directives'
 import { setTheme, setDesignSystem, setLocale } from './utils'
-import { DesignSystem } from './utils/DesignSystem'
-import { Theme } from './utils/Theme'
-import { Locale } from './utils/Locale'
+import DesignSystem from './types/DesignSystem'
+import Theme from './types/Theme'
+import Locale from './types/Locale'
 import { SoramitsuUIStorePlugin, ElementUIPlugin } from './plugins'
 import { Loading, Message, MessageBox, Notification } from './plugins/elementUI'
 import { SDialogMixin } from './mixins'
diff --git a/src/locale/index.ts b/src/locale/index.ts
index 1f96660d..a4886c50 100644
--- a/src/locale/index.ts
+++ b/src/locale/index.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 
-import { Locale } from '../utils/Locale'
+import Locale from '../types/Locale'
 
 import en from './en'
 import ja from './ja'
diff --git a/src/store/LibraryLocale.ts b/src/store/LibraryLocale.ts
index 6f76ec3b..03366446 100644
--- a/src/store/LibraryLocale.ts
+++ b/src/store/LibraryLocale.ts
@@ -4,7 +4,7 @@ import fromPairs from 'lodash/fp/fromPairs'
 import flow from 'lodash/fp/flow'
 import concat from 'lodash/fp/concat'
 
-import { Locale } from '../utils/Locale'
+import Locale from '../types/Locale'
 import i18n from '../locale'
 
 const types = flow(
diff --git a/src/store/LibraryTheme.ts b/src/store/LibraryTheme.ts
index 0347bbf3..9bdfea2b 100644
--- a/src/store/LibraryTheme.ts
+++ b/src/store/LibraryTheme.ts
@@ -4,13 +4,13 @@ import fromPairs from 'lodash/fp/fromPairs'
 import flow from 'lodash/fp/flow'
 import concat from 'lodash/fp/concat'
 
-import { Theme } from '../utils/Theme'
-import { DesignSystem } from '../utils/DesignSystem'
+import Theme from '../types/Theme'
+import DesignSystem from '../types/DesignSystem'
 
 const types = flow(
   flatMap(x => [x + '_REQUEST', x + '_SUCCESS', x + '_FAILURE']),
   concat([
-    'CHANGE_THEME',
+    'SET_THEME',
     'SET_DESIGN_SYSTEM'
   ]),
   map(x => [x, x]),
@@ -41,7 +41,7 @@ const getters = {
 }
 
 const mutations = {
-  [types.CHANGE_THEME] (state: State, theme: Theme) {
+  [types.SET_THEME] (state: State, theme: Theme) {
     state.theme = theme
   },
   [types.SET_DESIGN_SYSTEM] (state: State, designSystem: DesignSystem) {
@@ -50,8 +50,8 @@ const mutations = {
 }
 
 const actions = {
-  changeTheme ({ commit }, { theme }) {
-    commit(types.CHANGE_THEME, theme)
+  setTheme ({ commit }, theme: Theme) {
+    commit(types.SET_THEME, theme)
   },
   setDesignSystem ({ commit }, designSystem: DesignSystem) {
     commit(types.SET_DESIGN_SYSTEM, designSystem)
diff --git a/src/stories/Collapse/SCollapse.stories.ts b/src/stories/Collapse/SCollapse.stories.ts
index 806b4fe8..79899a72 100644
--- a/src/stories/Collapse/SCollapse.stories.ts
+++ b/src/stories/Collapse/SCollapse.stories.ts
@@ -2,7 +2,7 @@ import { withKnobs, boolean, select } from '@storybook/addon-knobs'
 
 import { SCollapse, SCollapseItem, SDesignSystemProvider } from '../../components'
 import { BorderTypes } from '../../components/Collapse'
-import { DesignSystem } from '../../utils/DesignSystem'
+import DesignSystem from '../../types/DesignSystem'
 
 export default {
   component: SCollapse,
diff --git a/src/stories/Intro/Intro.stories.mdx b/src/stories/Intro/Intro.stories.mdx
index 6657d37f..ba0f71e3 100644
--- a/src/stories/Intro/Intro.stories.mdx
+++ b/src/stories/Intro/Intro.stories.mdx
@@ -34,25 +34,70 @@ For instance, `soramitsuUI.ts`:
 
 ```
 import Vue from 'vue'
-import SoramitsuElements, { Message, MessageBox, Notification } from '@soramitsu/soramitsu-js-ui'
-import '@soramitsu/soramitsu-js-ui/lib/styles'
 
-Vue.use(SoramitsuElements)
+import SoramitsuElements, {
+  Message,
+  MessageBox,
+  Notification,
+  setTheme,
+  setDesignSystem,
+  Theme,
+  DesignSystem
+} from '@soramitsu/soramitsu-js-ui'
+
+import store from '@/store'
+
+Vue.use(SoramitsuElements, { store })
+Vue.prototype.$prompt = MessageBox.prompt
+Vue.prototype.$alert = MessageBox.alert
+Vue.prototype.$message = Message
+Vue.prototype.$notify = Notification
+
+setTheme(Theme.LIGHT)
+setDesignSystem(DesignSystem.NEUMORPHIC)
+```
+
+You could also use direct components import:
+
+```
+import Vue from 'vue'
+
+import Theme from '@soramitsu/soramitsu-js-ui/lib/types/Theme'
+import DesignSystem from '@soramitsu/soramitsu-js-ui/lib/types/DesignSystem'
+import { setTheme, setDesignSystem } from '@soramitsu/soramitsu-js-ui/lib/utils'
+
+import ElementUIPlugin, { Message, MessageBox, Notification } from '@soramitsu/soramitsu-js-ui/lib/plugins/elementUI'
+import SoramitsuUIStorePlugin from '@soramitsu/soramitsu-js-ui/lib/plugins/soramitsuUIStore'
+
+import SButton from '@soramitsu/soramitsu-js-ui/lib/components/Button/SButton'
+
+import store from '@/store'
+
+Vue.use(ElementUIPlugin)
+Vue.use(SoramitsuUIStorePlugin, { store })
+Vue.use(SButton)
+
 Vue.prototype.$prompt = MessageBox.prompt
 Vue.prototype.$alert = MessageBox.alert
 Vue.prototype.$message = Message
 Vue.prototype.$notify = Notification
 
+setTheme(Theme.LIGHT)
+setDesignSystem(DesignSystem.NEUMORPHIC)
 ```
 
-# 4. Add all required styles
+# 4. Add element-ui types
+
+Add `"element-ui"` in `tsconfig.json` file (`"types"` section)
+
+# 5. Add all required styles
 
 The previous section added not all required styles. To fix it you should add imports into `scss` file.
 
 For instance, `soramitsu-variables.scss`:
 
 ```
-@import '../../node_modules/@soramitsu/soramitsu-js-ui/lib/styles/index';
+@import '~@soramitsu/soramitsu-js-ui/lib/styles/index';
 ```
 
 If you want to customise some colors, borders, paddings, size, etc. - you can override scss variables.
@@ -65,6 +110,6 @@ $s-color-theme-accent: #ED145B;
 // Basic colors
 $s-color-base-content-primary: #0D0248;
 
-@import '../../node_modules/@soramitsu/soramitsu-js-ui/lib/styles/index';
+@import '~@soramitsu/soramitsu-js-ui/lib/styles/index';
 
 ```
diff --git a/src/stories/SButton.stories.ts b/src/stories/SButton.stories.ts
index bd7bc987..37d8ad88 100644
--- a/src/stories/SButton.stories.ts
+++ b/src/stories/SButton.stories.ts
@@ -1,9 +1,9 @@
 import { text, boolean, select, withKnobs } from '@storybook/addon-knobs'
 
 import { SButton, SButtonGroup, SRow, SCol, SMain, SIcon, SDesignSystemProvider } from '../components'
-import { Size, BorderRadius } from '../types'
 import { ButtonTypes, ButtonIconPosition } from '../components/Button'
-import { DesignSystem } from '../utils/DesignSystem'
+import { Size, BorderRadius } from '../types'
+import DesignSystem from '../types/DesignSystem'
 
 export default {
   component: SButton,
diff --git a/src/stories/SCard.stories.ts b/src/stories/SCard.stories.ts
index 67afbb4f..73bd9996 100644
--- a/src/stories/SCard.stories.ts
+++ b/src/stories/SCard.stories.ts
@@ -1,9 +1,9 @@
 import { text, withKnobs, select, boolean } from '@storybook/addon-knobs'
 
 import { SCard, SRow, SDropdown, SDropdownItem, SDesignSystemProvider } from '../components'
-import { BorderRadius, Status, Size } from '../types'
 import { CardShadow } from '../components/Card'
-import { DesignSystem } from '../utils/DesignSystem'
+import { BorderRadius, Status, Size } from '../types'
+import DesignSystem from '../types/DesignSystem'
 
 export default {
   component: SCard,
diff --git a/src/stories/SDialog.stories.ts b/src/stories/SDialog.stories.ts
index 1762e3d9..4fe4be05 100644
--- a/src/stories/SDialog.stories.ts
+++ b/src/stories/SDialog.stories.ts
@@ -2,7 +2,7 @@ import { text, withKnobs, boolean, select } from '@storybook/addon-knobs'
 
 import { SDialog, SRow, SButton, SDesignSystemProvider } from '../components'
 import { BorderRadius } from '../types'
-import { DesignSystem } from '../utils/DesignSystem'
+import DesignSystem from '../types/DesignSystem'
 
 export default {
   component: SDialog,
diff --git a/src/stories/SFloatInput.stories.ts b/src/stories/SFloatInput.stories.ts
index 0de80d32..3ae7bc56 100644
--- a/src/stories/SFloatInput.stories.ts
+++ b/src/stories/SFloatInput.stories.ts
@@ -1,7 +1,7 @@
 import { number, text, boolean, object, select, withKnobs } from '@storybook/addon-knobs'
 
 import { SFloatInput, SRow, SDesignSystemProvider } from '../components'
-import { DesignSystem } from '../utils/DesignSystem'
+import DesignSystem from '../types/DesignSystem'
 
 export default {
   component: SFloatInput,
diff --git a/src/stories/SInput.stories.ts b/src/stories/SInput.stories.ts
index 9bafddbe..0e563715 100644
--- a/src/stories/SInput.stories.ts
+++ b/src/stories/SInput.stories.ts
@@ -1,9 +1,9 @@
 import { text, boolean, withKnobs, number, select } from '@storybook/addon-knobs'
 
 import { SInput, SRow, SCol, SDesignSystemProvider } from '../components'
-import { BorderRadius } from '../types'
 import { InputType, InputSize } from '../components/Input'
-import { DesignSystem } from '../utils/DesignSystem'
+import { BorderRadius } from '../types'
+import DesignSystem from '../types/DesignSystem'
 
 export default {
   component: SInput,
diff --git a/src/stories/SRadio.stories.ts b/src/stories/SRadio.stories.ts
index 3e10ba4d..6f57881b 100644
--- a/src/stories/SRadio.stories.ts
+++ b/src/stories/SRadio.stories.ts
@@ -2,7 +2,7 @@ import { withKnobs, select, boolean } from '@storybook/addon-knobs'
 
 import { SRadio, SRadioGroup, SRow, SCol, SDesignSystemProvider } from '../components'
 import { Size } from '../types'
-import { DesignSystem } from '../utils/DesignSystem'
+import DesignSystem from '../types/DesignSystem'
 
 export default {
   component: SRadio,
diff --git a/src/stories/SSwitch.stories.ts b/src/stories/SSwitch.stories.ts
index e4d5836d..60b111df 100644
--- a/src/stories/SSwitch.stories.ts
+++ b/src/stories/SSwitch.stories.ts
@@ -1,7 +1,7 @@
 import { text, number, boolean, select, withKnobs } from '@storybook/addon-knobs'
 
 import { SSwitch, SDesignSystemProvider } from '../components'
-import { DesignSystem } from '../utils/DesignSystem'
+import DesignSystem from '../types/DesignSystem'
 
 export default {
   component: SSwitch,
diff --git a/src/stories/STooltip.stories.ts b/src/stories/STooltip.stories.ts
index 24fac1f5..29460648 100644
--- a/src/stories/STooltip.stories.ts
+++ b/src/stories/STooltip.stories.ts
@@ -1,9 +1,9 @@
 import { text, withKnobs, boolean, select, number } from '@storybook/addon-knobs'
 
 import { SButton, STooltip, SRow, SMain, SDesignSystemProvider } from '../components'
-import { BorderRadius } from '../types'
 import { TooltipPlacement, TooltipTheme } from '../components/Tooltip'
-import { DesignSystem } from '../utils/DesignSystem'
+import { BorderRadius } from '../types'
+import DesignSystem from '../types/DesignSystem'
 
 export default {
   component: STooltip,
diff --git a/src/stories/Tab/STabs.stories.ts b/src/stories/Tab/STabs.stories.ts
index 07e72320..296da45a 100644
--- a/src/stories/Tab/STabs.stories.ts
+++ b/src/stories/Tab/STabs.stories.ts
@@ -1,9 +1,9 @@
 import { boolean, select, withKnobs } from '@storybook/addon-knobs'
 
 import { STabs, STab, SDesignSystemProvider } from '../../components'
-import { BorderRadius } from '../../types'
 import { TabsPosition, TabsType } from '../../components/Tab'
-import { DesignSystem } from '../../utils/DesignSystem'
+import { BorderRadius } from '../../types'
+import DesignSystem from '../../types/DesignSystem'
 
 export default {
   component: STabs,
diff --git a/src/styles/select.scss b/src/styles/select.scss
index 665e1ce0..81fa5628 100644
--- a/src/styles/select.scss
+++ b/src/styles/select.scss
@@ -45,7 +45,7 @@ $select-prefix-height: $s-size-mini;
       display: flex;
       align-items: center;
       width: var(--s-icon-font-size-big);
-      font-family: var(--s-font-family-icons);
+      font-family: var(--s-font-family-icons) !important;
       font-size: var(--s-icon-font-size-big);
       &:before {
         content: $s-icon-arrows-chevron-top-rounded-24;
diff --git a/src/types/DesignSystem.ts b/src/types/DesignSystem.ts
new file mode 100644
index 00000000..23504c15
--- /dev/null
+++ b/src/types/DesignSystem.ts
@@ -0,0 +1,6 @@
+enum DesignSystem {
+  DEFAULT = '',
+  NEUMORPHIC = 'neumorphic'
+}
+
+export default DesignSystem
diff --git a/src/types/Locale.ts b/src/types/Locale.ts
new file mode 100644
index 00000000..7b15b955
--- /dev/null
+++ b/src/types/Locale.ts
@@ -0,0 +1,6 @@
+enum Locale {
+  EN = 'en',
+  JA = 'ja'
+}
+
+export default Locale
diff --git a/src/utils/Theme.ts b/src/types/Theme.ts
similarity index 51%
rename from src/utils/Theme.ts
rename to src/types/Theme.ts
index ba9907fc..1de97d74 100644
--- a/src/utils/Theme.ts
+++ b/src/types/Theme.ts
@@ -1,4 +1,6 @@
-export enum Theme {
+enum Theme {
   DARK = 'dark',
   LIGHT = 'light'
 }
+
+export default Theme
diff --git a/src/utils/DesignSystem.ts b/src/utils/DesignSystem.ts
deleted file mode 100644
index 10b9bafa..00000000
--- a/src/utils/DesignSystem.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum DesignSystem {
-  DEFAULT = '',
-  NEUMORPHIC = 'neumorphic'
-}
diff --git a/src/utils/KeyValues.ts b/src/utils/KeyValues.ts
index 1ae08493..f9e2ff8e 100644
--- a/src/utils/KeyValues.ts
+++ b/src/utils/KeyValues.ts
@@ -1,4 +1,4 @@
-export class KeyValues {
+export default class KeyValues {
   private static readonly digits = /[0-9]/
   private static readonly numbers = /[0-9.]/
 
diff --git a/src/utils/Locale.ts b/src/utils/Locale.ts
deleted file mode 100644
index 0d120b94..00000000
--- a/src/utils/Locale.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum Locale {
-  EN = 'en',
-  JA = 'ja'
-}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index c3420fbd..38741bea 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,16 +1,16 @@
 import store from '../store'
-import { Theme } from './Theme'
-import { DesignSystem } from './DesignSystem'
-import { Locale } from './Locale'
+import Theme from '../types/Theme'
+import DesignSystem from '../types/DesignSystem'
+import Locale from '../types/Locale'
 
-export const setTheme = (theme: Theme) => {
-  store.dispatch('changeTheme', { theme })
+export const setTheme = async (theme: Theme) => {
+  await store.dispatch('setTheme', theme)
 }
 
-export const setDesignSystem = (designSystem: DesignSystem) => {
-  store.dispatch('setDesignSystem', designSystem)
+export const setDesignSystem = async (designSystem: DesignSystem) => {
+  await store.dispatch('setDesignSystem', designSystem)
 }
 
-export const setLocale = (locale: Locale) => {
-  store.dispatch('setLocale', locale)
+export const setLocale = async (locale: Locale) => {
+  await store.dispatch('setLocale', locale)
 }
diff --git a/yarn.lock b/yarn.lock
index 2594feed..55866ce1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5122,6 +5122,11 @@ core-js@^3.0.1, core-js@^3.0.4, core-js@^3.6.4, core-js@^3.6.5:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
   integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
 
+core-js@^3.1.3:
+  version "3.15.2"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
+  integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -6738,6 +6743,17 @@ fast-glob@^2.0.2, fast-glob@^2.2.6:
     merge2 "^1.2.3"
     micromatch "^3.1.10"
 
+fast-glob@^3.0.0:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
+  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-glob@^3.0.3:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d"
@@ -7301,6 +7317,13 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -10533,6 +10556,14 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -11620,6 +11651,11 @@ picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
+picomatch@^2.2.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+
 picomodal@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/picomodal/-/picomodal-3.0.0.tgz#facd30f4fbf34a809c1e04ea525f004f399c0b82"
@@ -13401,6 +13437,15 @@ rollup-plugin-delete@^1.1.0:
   dependencies:
     del "^4.1.1"
 
+rollup-plugin-multi-input@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-multi-input/-/rollup-plugin-multi-input-1.3.1.tgz#07b903b618c005871fea1bd0c4efae7d1aac4fa1"
+  integrity sha512-bPsxHR6dUney7zsCAAlfkq7lbuy5xph2CvUstSv88oqhtRiLWXwVjiA1Gb4HVjC6I9sJI2eZeQlozXa+GXJKDA==
+  dependencies:
+    core-js "^3.1.3"
+    fast-glob "^3.0.0"
+    lodash "^4.17.11"
+
 rollup-plugin-scss@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-scss/-/rollup-plugin-scss-2.5.0.tgz#ce97d829b27d053007a0e7bd22269eb9af3e7705"