diff --git a/keyboards/handwired/daktil/config.h b/keyboards/handwired/daktil/config.h
index d365a5ab77..64b37c24dd 100644
--- a/keyboards/handwired/daktil/config.h
+++ b/keyboards/handwired/daktil/config.h
@@ -23,9 +23,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x1308
-#define DEVICE_VER      0x0001
+#define VENDOR_ID       0x6660
+#define PRODUCT_ID      0xD571
+#define DEVICE_VER      0x0002
 #define MANUFACTURER    Ludamila
 #define PRODUCT         Daktil
 #define DESCRIPTION     Dober stukar. Vec: wiki.ljudmila.org
@@ -58,7 +58,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DISABLE_SPACE_CADET_ROLLOVER
 
 /* Set 0 if debouncing isn't needed */
-#define DEBOUNCE    15
+#define DEBOUNCE    0
 
 #define PREVENT_STUCK_MODIFIERS
 
diff --git a/keyboards/handwired/daktil/keymaps/default/keymap.c b/keyboards/handwired/daktil/keymaps/default/keymap.c
index a6cf3c0979..be8fc75824 100644
--- a/keyboards/handwired/daktil/keymaps/default/keymap.c
+++ b/keyboards/handwired/daktil/keymaps/default/keymap.c
@@ -36,23 +36,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [BASE] = LAYOUT_dactyl(  // layer 0 : default
         // left hand
-           KC_EQL,         KC_1,           KC_2,     KC_3,     KC_4,  KC_5,
-          KC_DELT,         KC_Q,           KC_W,     KC_E,     KC_R,  KC_T,
-  LT(SYMB,KC_GRV),         KC_A,           KC_S,     KC_D,     KC_F,  KC_G,
-          KC_LSPO,  CTL_T(KC_Z),           KC_X,     KC_C,     KC_V,  KC_B,
-  LT(SYMB,KC_GRV),      KC_QUOT,  LALT(KC_LSFT),   KC_INS, KC_RGHT,
-                                                                   KC_SPC, ALT_T(KC_APP),
-                                                                                 KC_BSPC,
-                                                         LGUI_T(KC_ESC), KC_HOME, KC_END,
+          KC_DELT,         KC_1,           KC_2,     KC_3,     KC_4,  KC_5,
+           KC_EQL,         KC_Q,           KC_W,     KC_E,     KC_R,  KC_T,
+          KC_LSPO,         KC_A,           KC_S,     KC_D,     KC_F,  KC_G,
+  LT(SYMB,KC_GRV),  CTL_T(KC_Z),           KC_X,     KC_C,     KC_V,  KC_B,
+          KC_TRNS,      KC_TRNS,  ALT_T(KC_APP),   KC_INS,  KC_TRNS,
+                                                                KC_SPC, KC_LALT,
+                                                                        KC_BSPC,
+                                                LGUI_T(KC_ESC), KC_HOME, KC_END,
         // right hand
                              KC_6,   KC_7,     KC_8,     KC_9,               KC_0,         KC_MINS,
                              KC_Y,   KC_U,     KC_I,     KC_O,               KC_P,         KC_BSLS,
-                             KC_H,   KC_J,     KC_K,     KC_L,  LT(MDIA, KC_SCLN),  GUI_T(KC_QUOT),
-                             KC_N,   KC_M,  KC_COMM,   KC_DOT,     CTL_T(KC_SLSH),         KC_RSPC,
-                                    KC_UP,  KC_LBRC,  KC_RBRC,            KC_RBRC,          KC_FN1,
-             KC_ENT, KC_TAB,
-     LGUI_T(KC_ESC),
-            KC_RALT, KC_PGDN, KC_PGUP
+                             KC_H,   KC_J,     KC_K,     KC_L,  LT(MDIA, KC_SCLN),         KC_RSPC,
+                             KC_N,   KC_M,  KC_COMM,   KC_DOT,     CTL_T(KC_SLSH), LT(SYMB,KC_GRV),
+                                  KC_TRNS,  KC_LBRC,  KC_RBRC,            KC_TRNS,         KC_TRNS,
+                            KC_ENT, KC_TAB,
+                    LGUI_T(KC_ESC),
+                           KC_RALT, KC_PGDN, KC_PGUP
     ),
 /* Keymap 1: Symbol Layer
  *