7 files changed, 19 insertions, 28 deletions
diff --git a/keyboards/infinity60/infinity60.h b/keyboards/infinity60/infinity60.h
index f1ba15e48..21b8eeba2 100644
--- a/keyboards/infinity60/infinity60.h
+++ b/keyboards/infinity60/infinity60.h
@@ -19,8 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#ifdef INFINITY_PROTOTYPE
+#define LAYOUT_60_ansi_split_bs_rshift KEYMAP
 
+#ifdef INFINITY_PROTOTYPE
 /* Infinity prototype */
 #define KEYMAP( \
     K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K86, \
diff --git a/keyboards/infinity60/keymaps/jpetermans/readme.md b/keyboards/infinity60/keymaps/jpetermans/readme.md
index b83057ea7..00421015b 100644
--- a/keyboards/infinity60/keymaps/jpetermans/readme.md
+++ b/keyboards/infinity60/keymaps/jpetermans/readme.md
@@ -18,7 +18,7 @@ digits mean "row" and "col", i.e. 45 means pin 4, column 5 in the IS31 datasheet
 
 The IS31 includes 8 led pages (or frames) 0-7 than can be displayed, and each page consists of 144 bytes.
 - **bytes 0 - 17** - LED control (on/off).
-    * 18 pins which alternate between A and B matrices (A1, B1, A2, B2, ..).
+    * 18 bytes which alternate between A and B matrices (A1, B1, A2, B2, ..).
     * Each byte controls the 8 leds on that pin with bits (8 to 1).
 - **bytes 8 - 35** - Blink control.
     * Same as LED control above, but sets blink on/off.
@@ -47,7 +47,7 @@ write_led_page(5, led_numpad, 16);
 Remaining led control is done through the led mailbox using these message types:
 - **SET_FULL_ROW** (3 bytes) - message type, 8-bit mask, and row#. Sets all leds on one pin per the bit mask.
 - **OFF_LED, ON_LED, TOGGLE_LED** (3 bytes) - message type, led address, and page#. Off/on/toggle specific led.
-- **BLINK_OFF_LED, BLINK_ON_LED, BLINK_OFF_LED** (3 bytes) - message type, led address, and page#. Set blink Off/on/toggle for specific led.
+- **BLINK_OFF_LED, BLINK_ON_LED, BLINK_TOGGLE_LED** (3 bytes) - message type, led address, and page#. Set blink Off/on/toggle for specific led.
 - **TOGGLE_ALL** (1 byte) - Turn on/off full backlight.
 - **TOGGLE_BACKLIGHT** (2 bytes) - message type, on/off. Sets backlight completely off, no leds will display.
 - **DISPLAY_PAGE** (2 bytes) - message type, page to display. Switch to specific pre-set page.
@@ -67,7 +67,7 @@ chMBPost(&led_mailbox, message, timeout);
 
 An example:
 ```c
-//set the message to be sent. First byte (LSB) is the led address, and second is the message type
+//set the message to be sent. First byte (LSB) is the message type, and second is the led address
 msg=(42 << 8) | ON_LED;
 
 //send msg to the led mailbox
diff --git a/keyboards/infinity60/led.c b/keyboards/infinity60/led.c
index 53147a78a..bef1f8623 100644
--- a/keyboards/infinity60/led.c
+++ b/keyboards/infinity60/led.c
@@ -1,5 +1,6 @@
 /*
 Copyright 2015 Jun Wako <wakojun@gmail.com>
+Copyright 2017 jpetermans <tibcmhhm@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/keyboards/infinity60/led_controller.c b/keyboards/infinity60/led_controller.c
index 21f95a9c1..f319f8c68 100644
--- a/keyboards/infinity60/led_controller.c
+++ b/keyboards/infinity60/led_controller.c
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 flabbergast <s3+flabbergast@sdfeu.org>
+Copyright 2017 jpetermans <tibcmhhm@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/keyboards/infinity60/led_controller.h b/keyboards/infinity60/led_controller.h
index eb6060f26..e4b471764 100644
--- a/keyboards/infinity60/led_controller.h
+++ b/keyboards/infinity60/led_controller.h
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 flabbergast <s3+flabbergast@sdfeu.org>
+Copyright 2017 jpetermans <tibcmhhm@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/keyboards/infinity60/readme.md b/keyboards/infinity60/readme.md
index 97457b407..bca26c69f 100644
--- a/keyboards/infinity60/readme.md
+++ b/keyboards/infinity60/readme.md
@@ -1,29 +1,14 @@
-Infinity 60% keyboard firmware
-======================
+Infinity 60%
+============
 
-## Quantum MK Firmware
+A compact community driven keyboard.
 
-For the full Quantum feature list, see [the parent readme](/).
+Keyboard Maintainer: QMK Community
+Hardware Supported: Infinity 60% PCB
+Hardware Availability: https://input.club/devices/infinity-keyboard/
 
-## Keymaps
+Make example for this keyboard (after setting up your build environment):
 
-Several versions of keymaps are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files.
-
-Keymaps follow the format **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/`
-
-
-## Compiling
-
-Download or clone the whole firmware and navigate to the keyboards/infinity60 folder. Once your dev env is setup, you'll be able to use the `make` command to both compile your keymap and flash it to your keyboard.
-
-To just compile, which generates the output files in the `.build` folder at the root of the repository, run `make keymap`, where keymap is the name of the keymap that you want to compile.
-
-## Flashing
-
-To flash the firmware to the keyboard
-
-1. First press the flash button on the bottom of the keyboard. If you already have a flah button mapped in a keyboard layout running on the keyboard, you can also use that.
-2. Then run `make keymap-dfu-util`, where keymap is the name of the keymap you want to flash. On Linux based operating systems you might need to run the comamnd as root, for example `sudo make keymap-dfu-util` on Ubuntu.
-
-**Tip** `make keymap-dfu-util` will also compile the keymap if needed, so you can skip the compilation step if you want to.
+    make infinity60-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.
diff --git a/keyboards/infinity60/rules.mk b/keyboards/infinity60/rules.mk
index a3ddd55c6..f689b5475 100644
--- a/keyboards/infinity60/rules.mk
+++ b/keyboards/infinity60/rules.mk
@@ -65,3 +65,5 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = yes # Custom matrix file
+
+LAYOUTS = 60_ansi_split_bs_rshift
+\ No newline at end of file