13 files changed, 21 insertions, 24 deletions
diff --git a/keyboards/duck/eagle_viper/readme.md b/keyboards/duck/eagle_viper/readme.md
index ded0fa72e9..14fb166698 100644
--- a/keyboards/duck/eagle_viper/readme.md
+++ b/keyboards/duck/eagle_viper/readme.md
@@ -2,7 +2,7 @@
 
 Non official firmware for custom Korean keyboard with 60% key layout made by Duck.
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
 Newest version is the [Eagle/Viper V2](http://duck0113.tistory.com/127)
 
diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h
index f04b4a0fd3..9c49344ff9 100644
--- a/keyboards/duck/eagle_viper/v2/config.h
+++ b/keyboards/duck/eagle_viper/v2/config.h
@@ -21,9 +21,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      0x6050
-#define DEVICE_VER      0x0104
+#define VENDOR_ID       0x444B // Duck ("DK")
+#define PRODUCT_ID      0x4556 // Eagle/Viper ("EV")
+#define DEVICE_VER      0x0002
 #define MANUFACTURER    Duck
 #define PRODUCT         Eagle/Viper V2
 #define DESCRIPTION     60% Korean custom keyboard
diff --git a/keyboards/duck/eagle_viper/v2/readme.md b/keyboards/duck/eagle_viper/v2/readme.md
index b613b63b90..32ad8453ca 100644
--- a/keyboards/duck/eagle_viper/v2/readme.md
+++ b/keyboards/duck/eagle_viper/v2/readme.md
@@ -11,7 +11,7 @@ Make example for this keyboard (after setting up your build environment):
 
     make eagle_viper/v2:default
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
 ## Hardware Notes
 
diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h
index 80b531fd52..54c5321c6b 100644
--- a/keyboards/duck/jetfire/config.h
+++ b/keyboards/duck/jetfire/config.h
@@ -20,9 +20,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      0x6050
-#define DEVICE_VER      0x0104
+#define VENDOR_ID       0x444B // Duck ("DK")
+#define PRODUCT_ID      0x4A46 // Jetfire ("JF")
+#define DEVICE_VER      0x0001
 #define MANUFACTURER    Duck
 #define PRODUCT         Jetfire
 #define DESCRIPTION     A custom keyboard
diff --git a/keyboards/duck/jetfire/readme.md b/keyboards/duck/jetfire/readme.md
index fe641e622f..34b351a726 100644
--- a/keyboards/duck/jetfire/readme.md
+++ b/keyboards/duck/jetfire/readme.md
@@ -15,4 +15,4 @@ Make example for this keyboard (after setting up your build environment):
 
     make duck/jetfire:default
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h
index bc984c7e56..745af4330d 100644
--- a/keyboards/duck/lightsaver/config.h
+++ b/keyboards/duck/lightsaver/config.h
@@ -21,8 +21,8 @@ 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      0x1337
+#define VENDOR_ID       0x444B // Duck ("DK")
+#define PRODUCT_ID      0x4C53 // Lightsaver ("LS")
 #define DEVICE_VER      0x0003
 #define MANUFACTURER    Duck
 #define PRODUCT         Lightsaver V3
diff --git a/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c b/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
index 518ba2d21a..70dc17bb13 100644
--- a/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
+++ b/keyboards/duck/lightsaver/keymaps/rasmus/keymap.c
@@ -91,9 +91,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-};
-
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
   switch(id) {
     case SHRG:
diff --git a/keyboards/duck/lightsaver/readme.md b/keyboards/duck/lightsaver/readme.md
index 9d4b453c0d..a77a90111d 100644
--- a/keyboards/duck/lightsaver/readme.md
+++ b/keyboards/duck/lightsaver/readme.md
@@ -13,7 +13,7 @@ Make example for this keyboard (after setting up your build environment):
 
     make lightsaver:default
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
 ## Notes
 Thanks to Ralf Schmitt for previous implementations in his [TMK fork](https://github.com/xauser/tmk_keyboard/tree/xauser/) and few helping words.
diff --git a/keyboards/duck/octagon/readme.md b/keyboards/duck/octagon/readme.md
index 7f5b2f7e60..b91a76c706 100644
--- a/keyboards/duck/octagon/readme.md
+++ b/keyboards/duck/octagon/readme.md
@@ -2,7 +2,7 @@
 
 Non official firmware for custom Korean keyboard with 75% key layout made by Duck.
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
 Newest version is the [Octagon V2](http://duck0113.tistory.com/127)
 
diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h
index fbbc8999bb..a2b3d64130 100644
--- a/keyboards/duck/octagon/v1/config.h
+++ b/keyboards/duck/octagon/v1/config.h
@@ -21,9 +21,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      0x6050
-#define DEVICE_VER      0x0104
+#define VENDOR_ID       0x444B // Duck ("DK")
+#define PRODUCT_ID      0x4F31 // Octagon V1 ("O1")
+#define DEVICE_VER      0x0001
 #define MANUFACTURER    Duck
 #define PRODUCT         Octagon V1
 #define DESCRIPTION     Duck Octagon V1
diff --git a/keyboards/duck/octagon/v1/readme.md b/keyboards/duck/octagon/v1/readme.md
index f5cb2d7892..f614b35778 100644
--- a/keyboards/duck/octagon/v1/readme.md
+++ b/keyboards/duck/octagon/v1/readme.md
@@ -11,7 +11,7 @@ Make example for this keyboard (after setting up your build environment):
 
     make duck/octagon/v1:default
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
 ## Hardware Notes
 
diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h
index c916a30a1e..7adcb2760a 100644
--- a/keyboards/duck/octagon/v2/config.h
+++ b/keyboards/duck/octagon/v2/config.h
@@ -21,9 +21,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      0x6050
-#define DEVICE_VER      0x0104
+#define VENDOR_ID       0x444B // Duck ("DK")
+#define PRODUCT_ID      0x4F32 // Octagon V2 ("O2")
+#define DEVICE_VER      0x0002
 #define MANUFACTURER    Duck
 #define PRODUCT         Octagon V2
 #define DESCRIPTION     Duck Octagon V2
diff --git a/keyboards/duck/octagon/v2/readme.md b/keyboards/duck/octagon/v2/readme.md
index 125f09f9cd..b409454fc6 100644
--- a/keyboards/duck/octagon/v2/readme.md
+++ b/keyboards/duck/octagon/v2/readme.md
@@ -11,7 +11,7 @@ Make example for this keyboard (after setting up your build environment):
 
     make octagon/v2:default
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
 ## Hardware Notes