diff --git a/buttplug/buttplug-device-config/buttplug-device-config.json b/buttplug/buttplug-device-config/buttplug-device-config.json
index 68dfc074e..01e4da09d 100644
--- a/buttplug/buttplug-device-config/buttplug-device-config.json
+++ b/buttplug/buttplug-device-config/buttplug-device-config.json
@@ -1,7 +1,7 @@
 {
   "version": {
     "major": 2,
-    "minor": 20
+    "minor": 21
   },
   "protocols": {
     "lovense": {
@@ -1381,7 +1381,8 @@
           "Gballs2",
           "GBalls3",
           "FM-LILAC-101",
-          "Xone"
+          "Xone",
+          "CBT002"
         ],
         "services": {
           "78667579-7b48-43db-b8c5-7928a6b0a335": {
@@ -1510,6 +1511,12 @@
               }
             ]
           }
+        },
+        {
+          "identifier": [
+            "CBT002"
+          ],
+          "name": "FunTown Caleo"
         }
       ]
     },
@@ -1521,7 +1528,8 @@
           "Sword",
           "Curve",
           "Solstice X",
-          "funwand"
+          "funwand",
+          "CBT001"
         ],
         "services": {
           "78667579-7b48-43db-b8c5-7928a6b0a335": {
@@ -1630,6 +1638,30 @@
             "funwand"
           ],
           "name": "MagicMotion Zenith"
+        },
+        {
+          "identifier": [
+            "CBT001"
+          ],
+          "name": "FunTown Jive",
+          "messages": {
+            "ScalarCmd": [
+              {
+                "StepRange": [
+                  0,
+                  100
+                ],
+                "ActuatorType": "Vibrate"
+              },
+              {
+                "StepRange": [
+                  0,
+                  100
+                ],
+                "ActuatorType": "Oscillate"
+              }
+            ]
+          }
         }
       ]
     },
diff --git a/buttplug/buttplug-device-config/buttplug-device-config.yml b/buttplug/buttplug-device-config/buttplug-device-config.yml
index 2c31e6bfe..633b96548 100644
--- a/buttplug/buttplug-device-config/buttplug-device-config.yml
+++ b/buttplug/buttplug-device-config/buttplug-device-config.yml
@@ -93,7 +93,7 @@
 #   user in the user device config file.
 version:
   major: 2
-  minor: 20
+  minor: 21
 protocols:
   lovense:
     # Lovense is special. Special in oh so many ways.
@@ -780,6 +780,7 @@ protocols:
         - GBalls3
         - FM-LILAC-101
         - Xone
+        - CBT002 # FunTown Caleo
       services:
         78667579-7b48-43db-b8c5-7928a6b0a335:
           tx: 78667579-a914-49a4-8333-aa3c0cd8fedc
@@ -843,6 +844,9 @@ protocols:
           ScalarCmd:
             - StepRange: [ 0, 100 ]
               ActuatorType: Oscillate
+      - identifier:
+          - CBT002
+        name: FunTown Caleo
   magic-motion-2:
     btle:
       names:
@@ -852,6 +856,7 @@ protocols:
         - Curve # Solstice
         - Solstice X
         - funwand # Zenith
+        - CBT001 # FunTown Jive
       services:
         78667579-7b48-43db-b8c5-7928a6b0a335:
           tx: 78667579-a914-49a4-8333-aa3c0cd8fedc
@@ -899,6 +904,15 @@ protocols:
       - identifier:
           - funwand
         name: MagicMotion Zenith
+      - identifier:
+          - CBT001
+        name: FunTown Jive
+        messages:
+          ScalarCmd:
+            - StepRange: [0, 100]
+              ActuatorType: Vibrate
+            - StepRange: [0, 100]
+              ActuatorType: Oscillate
   magic-motion-3:
     btle:
       names: