diff --git a/app/dts/behaviors/toggle_layer.dtsi b/app/dts/behaviors/toggle_layer.dtsi
index df6fd231..86a050d9 100644
--- a/app/dts/behaviors/toggle_layer.dtsi
+++ b/app/dts/behaviors/toggle_layer.dtsi
@@ -1,4 +1,10 @@
-/ {
+/*
+ * Copyright (c) 2020 Cody McGinnis <brainwart@gmail.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+ 
+ / {
 	behaviors {
 		tog: behavior_toggle_layer {
 			compatible = "zmk,behavior-toggle-layer";
diff --git a/app/include/zmk/keymap.h b/app/include/zmk/keymap.h
index c55207f5..c1f63932 100644
--- a/app/include/zmk/keymap.h
+++ b/app/include/zmk/keymap.h
@@ -3,5 +3,6 @@
 bool zmk_keymap_layer_active(u8_t layer);
 int zmk_keymap_layer_activate(u8_t layer);
 int zmk_keymap_layer_deactivate(u8_t layer);
+int zmk_keymap_layer_toggle(u8_t layer);
 
 int zmk_keymap_position_state_changed(u32_t position, bool pressed);
diff --git a/app/src/behaviors/behavior_toggle_layer.c b/app/src/behaviors/behavior_toggle_layer.c
index ff0fe6ab..13f4a29d 100644
--- a/app/src/behaviors/behavior_toggle_layer.c
+++ b/app/src/behaviors/behavior_toggle_layer.c
@@ -25,12 +25,7 @@ static int behavior_tog_init(struct device *dev)
 
 static int tog_keymap_binding_pressed(struct device *dev, u32_t position, u32_t layer, u32_t _)
 {
-  LOG_DBG("position %d layer %d current %d", position, layer, zmk_keymap_layer_active(layer));
-
-  if (zmk_keymap_layer_active(layer))
-    return zmk_keymap_layer_deactivate(layer);
-
-  return zmk_keymap_layer_activate(layer);
+  return zmk_keymap_layer_toggle(layer);
 }
 
 static int tog_keymap_binding_released(struct device *dev, u32_t position, u32_t layer, u32_t _)
diff --git a/app/src/keymap.c b/app/src/keymap.c
index ebb42eff..754305d0 100644
--- a/app/src/keymap.c
+++ b/app/src/keymap.c
@@ -91,6 +91,14 @@ int zmk_keymap_layer_deactivate(u8_t layer)
 	SET_LAYER_STATE(layer, false);
 };
 
+int zmk_keymap_layer_toggle(u8_t layer)
+{
+	if (zmk_keymap_layer_active(layer))
+    	return zmk_keymap_layer_deactivate(layer);
+
+  	return zmk_keymap_layer_activate(layer);
+};
+
 bool is_active_position(u32_t position, u8_t layer)
 {
 	return (zmk_keymap_layer_state & BIT(layer)) == BIT(layer)