diff --git a/jest.config.js b/jest.config.js
index cd689271..15f0d924 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,3 +1,5 @@
+const ignoredModules = ['@coreui/icons', '@coreui/utils'].join('|')
+
 module.exports = {
   moduleFileExtensions: [
     'js',
@@ -10,7 +12,7 @@ module.exports = {
     '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
     '^.+\\.(js|jsx)?$': '<rootDir>/node_modules/babel-jest'
   },
-  transformIgnorePatterns: ['/node_modules/(?!@coreui/icons)'],
+  transformIgnorePatterns: [`<rootDir>/node_modules/(?!${ignoredModules})`],
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/src/$1'
   },
diff --git a/src/views/charts/CChartBarExample.vue b/src/views/charts/CChartBarExample.vue
index eeb129e7..b8f28608 100644
--- a/src/views/charts/CChartBarExample.vue
+++ b/src/views/charts/CChartBarExample.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { CChartBar } from '@coreui/coreui-vue-chartjs'
+import { CChartBar } from '@coreui/vue-chartjs'
 
 export default {
   name: 'CChartBarExample',
diff --git a/src/views/charts/CChartBarSimple.vue b/src/views/charts/CChartBarSimple.vue
index 764f615d..4249f264 100644
--- a/src/views/charts/CChartBarSimple.vue
+++ b/src/views/charts/CChartBarSimple.vue
@@ -7,8 +7,9 @@
 </template>
 
 <script>
-import { CChartBar } from '@coreui/coreui-vue-chartjs'
-import { getColor, deepObjectsMerge } from '@coreui/coreui/dist/js/coreui-utilities'
+import { CChartBar } from '@coreui/vue-chartjs'
+import { getColor, deepObjectsMerge } from '@coreui/utils/src'
+
 export default {
   name: 'CChartBarSimple',
   components: { CChartBar },
diff --git a/src/views/charts/CChartDoughnutExample.vue b/src/views/charts/CChartDoughnutExample.vue
index 0e639a27..c60d8ff0 100644
--- a/src/views/charts/CChartDoughnutExample.vue
+++ b/src/views/charts/CChartDoughnutExample.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { CChartDoughnut } from '@coreui/coreui-vue-chartjs'
+import { CChartDoughnut } from '@coreui/vue-chartjs'
 
 export default {
   name: 'CChartDoughnutExample',
diff --git a/src/views/charts/CChartLineExample.vue b/src/views/charts/CChartLineExample.vue
index 52f26039..4839a4cf 100644
--- a/src/views/charts/CChartLineExample.vue
+++ b/src/views/charts/CChartLineExample.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { CChartLine } from '@coreui/coreui-vue-chartjs'
+import { CChartLine } from '@coreui/vue-chartjs'
 
 export default {
   name: 'CChartLineExample',
diff --git a/src/views/charts/CChartLineSimple.vue b/src/views/charts/CChartLineSimple.vue
index 9ad75aa0..ab534d66 100644
--- a/src/views/charts/CChartLineSimple.vue
+++ b/src/views/charts/CChartLineSimple.vue
@@ -7,8 +7,9 @@
 </template>
 
 <script>
-import { CChartLine } from '@coreui/coreui-vue-chartjs'
-import { getColor, deepObjectsMerge } from '@coreui/coreui/dist/js/coreui-utilities'
+import { CChartLine } from '@coreui/vue-chartjs'
+import { getColor, deepObjectsMerge } from '@coreui/utils/src'
+
 export default {
   name: 'CChartLineSimple',
   components: { CChartLine },
@@ -48,19 +49,12 @@ export default {
           data: this.dataPoints,
           borderColor: getColor(this.borderColor),
           backgroundColor: getColor(this.backgroundColor),
-          pointBackgroundColor: this.pointBackgroundColor,
+          pointBackgroundColor: getColor(this.pointHoverColor),
           pointHoverBackgroundColor: getColor(this.pointHoverColor),
           label: this.label
         }
       ]
     },
-    pointBackgroundColor () {
-      if (this.backgroundColor === 'transparent') {
-        return '#fff'
-      } else {
-        return getColor(this.backgroundColor)
-      }
-    },
     pointedOptions () {
       return {
         scales: {
diff --git a/src/views/charts/CChartPieExample.vue b/src/views/charts/CChartPieExample.vue
index 9da82091..43ccb6e9 100644
--- a/src/views/charts/CChartPieExample.vue
+++ b/src/views/charts/CChartPieExample.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { CChartPie } from '@coreui/coreui-vue-chartjs'
+import { CChartPie } from '@coreui/vue-chartjs'
 
 export default {
   name: 'CChartPieExample',
diff --git a/src/views/charts/CChartPolarAreaExample.vue b/src/views/charts/CChartPolarAreaExample.vue
index af960f6a..5187f81c 100644
--- a/src/views/charts/CChartPolarAreaExample.vue
+++ b/src/views/charts/CChartPolarAreaExample.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { CChartPolarArea } from '@coreui/coreui-vue-chartjs'
+import { CChartPolarArea } from '@coreui/vue-chartjs'
 
 export default {
   name: 'CChartPolarAreaExample',
diff --git a/src/views/charts/CChartRadarExample.vue b/src/views/charts/CChartRadarExample.vue
index 39b1db33..9939da30 100644
--- a/src/views/charts/CChartRadarExample.vue
+++ b/src/views/charts/CChartRadarExample.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { CChartRadar } from '@coreui/coreui-vue-chartjs'
+import { CChartRadar } from '@coreui/vue-chartjs'
 
 export default {
   name: 'CChartRadarExample',
diff --git a/src/views/charts/Charts.vue b/src/views/charts/Charts.vue
index 10cc95bc..313c89d2 100644
--- a/src/views/charts/Charts.vue
+++ b/src/views/charts/Charts.vue
@@ -56,9 +56,9 @@
     </CCardGroup>
   </div>
 </template>
+
 <script>
 import * as Charts from './index.js'
-
 export default {
   name: 'Charts',
   components: {
diff --git a/src/views/charts/MainChartExample.vue b/src/views/charts/MainChartExample.vue
index 8bc63ad3..08c6aa11 100644
--- a/src/views/charts/MainChartExample.vue
+++ b/src/views/charts/MainChartExample.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script>
-import { CChartLine } from '@coreui/coreui-vue-chartjs'
-import { getColor, hexToRgba } from '@coreui/coreui/dist/js/coreui-utilities'
+import { CChartLine } from '@coreui/vue-chartjs'
+import { getColor, hexToRgba } from '@coreui/utils/src'
 
 function random (min, max) {
   return Math.floor(Math.random() * (max - min + 1) + min)
diff --git a/tests/unit/containers/__snapshots__/TheHeaderDropdownAccnt.spec.js.snap b/tests/unit/containers/__snapshots__/TheHeaderDropdownAccnt.spec.js.snap
index fe946daa..d48e9e4f 100644
--- a/tests/unit/containers/__snapshots__/TheHeaderDropdownAccnt.spec.js.snap
+++ b/tests/unit/containers/__snapshots__/TheHeaderDropdownAccnt.spec.js.snap
@@ -7,6 +7,7 @@ exports[`TheHeaderDropdownAccnt.vue renders correctly 1`] = `
   class="c-header-nav-items"
   flip="true"
   innav="true"
+  offset="0"
   placement="bottom-end"
   togglertext="Dropdown"
 >
diff --git a/tests/unit/views/base/__snapshots__/Navbars.spec.js.snap b/tests/unit/views/base/__snapshots__/Navbars.spec.js.snap
index b7d1a65e..b46cb1d7 100644
--- a/tests/unit/views/base/__snapshots__/Navbars.spec.js.snap
+++ b/tests/unit/views/base/__snapshots__/Navbars.spec.js.snap
@@ -121,6 +121,7 @@ exports[`Navbars.vue renders correctly 1`] = `
               caret="true"
               flip="true"
               innav="true"
+              offset="0"
               placement="bottom-end"
               togglertext="Lang"
             >
@@ -169,6 +170,7 @@ exports[`Navbars.vue renders correctly 1`] = `
               caret="true"
               flip="true"
               innav="true"
+              offset="0"
               placement="bottom-end"
               togglertext="User"
             >
@@ -358,6 +360,7 @@ exports[`Navbars.vue renders correctly 1`] = `
               caret="true"
               flip="true"
               innav="true"
+              offset="0"
               placement="bottom-end"
               togglertext="Lang"
             >
@@ -406,6 +409,7 @@ exports[`Navbars.vue renders correctly 1`] = `
               caret="true"
               flip="true"
               innav="true"
+              offset="0"
               placement="bottom-end"
               togglertext="User"
             >
diff --git a/tests/unit/views/base/__snapshots__/Navs.spec.js.snap b/tests/unit/views/base/__snapshots__/Navs.spec.js.snap
index 4543f9d4..f6f04c6c 100644
--- a/tests/unit/views/base/__snapshots__/Navs.spec.js.snap
+++ b/tests/unit/views/base/__snapshots__/Navs.spec.js.snap
@@ -453,6 +453,7 @@ exports[`Navs.vue renders correctly 1`] = `
           flip="true"
           id="nav7_ddown"
           nav=""
+          offset="0"
           placement="bottom-end"
           togglertext="Dropdown"
         >
diff --git a/tests/unit/views/buttons/__snapshots__/ButtonGroups.spec.js.snap b/tests/unit/views/buttons/__snapshots__/ButtonGroups.spec.js.snap
index d5596f88..30388248 100644
--- a/tests/unit/views/buttons/__snapshots__/ButtonGroups.spec.js.snap
+++ b/tests/unit/views/buttons/__snapshots__/ButtonGroups.spec.js.snap
@@ -381,6 +381,7 @@ exports[`ButtonGroups.vue renders correctly 1`] = `
               caret="true"
               color="success"
               flip="true"
+              offset="0"
               placement="bottom-start"
               right=""
               text="Menu"
@@ -438,6 +439,7 @@ exports[`ButtonGroups.vue renders correctly 1`] = `
               caret="true"
               color="info"
               flip="true"
+              offset="0"
               placement="bottom-start"
               right=""
               split="true"
@@ -807,6 +809,7 @@ exports[`ButtonGroups.vue renders correctly 1`] = `
             class="mx-1"
             color="secondary"
             flip="true"
+            offset="0"
             placement="bottom-end"
             togglertext="Dropdown"
           >