diff --git a/common.mk b/common.mk
index 537cc3a2..540d8da4 100644
--- a/common.mk
+++ b/common.mk
@@ -58,10 +58,18 @@ ifdef SLEEP_LED_ENABLE
     OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 endif
 
+ifdef SOFTPWM_LED_ENABLE
+    SRC += $(COMMON_DIR)/softpwm_led.c
+    OPT_DEFS += -DSOFTPWM_LED_ENABLE
+ifdef BREATHING_LED_ENABLE
+    OPT_DEFS += -DBREATHING_LED_ENABLE
+endif
+else
 ifdef BREATHING_LED_ENABLE
     SRC += $(COMMON_DIR)/breathing_led.c
     OPT_DEFS += -DBREATHING_LED_ENABLE
 endif
+endif
 
 ifdef BACKLIGHT_ENABLE
     SRC += $(COMMON_DIR)/backlight.c
diff --git a/common/keyboard.c b/common/keyboard.c
index 08f86be3..c7793eec 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -31,7 +31,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "bootmagic.h"
 #include "eeconfig.h"
 #include "backlight.h"
+#ifdef SOFTPWM_LED_ENABLE
+#include "softpwm_led.h"
+#else
 #include "breathing_led.h"
+#endif
 #include "keymap_in_eeprom.h"
 #ifdef MOUSEKEY_ENABLE
 #   include "mousekey.h"
@@ -82,6 +86,10 @@ void keyboard_init(void)
     backlight_init();
 #endif
 
+#ifdef SOFTPWM_LED_ENABLE
+    softpwm_led_init();
+#endif
+
 #ifdef BREATHING_LED_ENABLE
     breathing_led_init();
 #endif
diff --git a/common/softpwm_led.c b/common/softpwm_led.c
new file mode 100644
index 00000000..e2195c2f
--- /dev/null
+++ b/common/softpwm_led.c
@@ -0,0 +1,155 @@
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include "led.h"
+#include "softpwm_led.h"
+#include "debug.h"
+
+#define SOFTPWM_LED_FREQ 64
+#define SOFTPWM_LED_TIMER_TOP F_CPU / (256 * SOFTPWM_LED_FREQ)
+
+uint8_t softpwm_ocr = 0;
+uint8_t softpwm_ocr_buff = 0;
+
+void softpwm_led_init(void)
+{
+#ifdef SOFTPWM_LED_TIMER3
+    /* Timer3 setup */
+    /* CTC mode */
+    TCCR3B |= (1<<WGM32);
+    /* Clock selelct: clk/8 */
+    TCCR3B |= (1<<CS30);
+    /* Set TOP value */
+    uint8_t sreg = SREG;
+    cli();
+    OCR3AH = (SOFTPWM_LED_TIMER_TOP >> 8) & 0xff;
+    OCR3AL = SOFTPWM_LED_TIMER_TOP & 0xff;
+    SREG = sreg;
+#else
+    /* Timer1 setup */
+    /* CTC mode */
+    TCCR1B |= (1<<WGM12);
+    /* Clock selelct: clk/8 */
+    TCCR1B |= (1<<CS10);
+    /* Set TOP value */
+    uint8_t sreg = SREG;
+    cli();
+    OCR1AH = (SOFTPWM_LED_TIMER_TOP >> 8) & 0xff;
+    OCR1AL = SOFTPWM_LED_TIMER_TOP & 0xff;
+    SREG = sreg;
+#endif
+}
+
+void softpwm_led_enable(void)
+{
+    /* Enable Compare Match Interrupt */
+#ifdef SOFTPWM_LED_TIMER3
+    TIMSK3 |= (1<<OCIE3A);
+    dprintf("softpwm led on: %u\n", TIMSK3 & (1<<OCIE3A));
+#else
+    TIMSK1 |= (1<<OCIE1A);
+    dprintf("softpwm led on: %u\n", TIMSK1 & (1<<OCIE1A));
+#endif
+}
+
+void softpwm_led_disable(void)
+{
+    /* Disable Compare Match Interrupt */
+#ifdef SOFTPWM_LED_TIMER3
+    TIMSK3 &= ~(1<<OCIE3A);
+    dprintf("softpwm led off: %u\n", TIMSK3 & (1<<OCIE3A));
+#else
+    TIMSK1 &= ~(1<<OCIE1A);
+    dprintf("softpwm led off: %u\n", TIMSK1 & (1<<OCIE1A));
+#endif
+}
+
+void softpwm_led_toggle(void)
+{
+    /* Disable Compare Match Interrupt */
+#ifdef SOFTPWM_LED_TIMER3
+    TIMSK3 ^= (1<<OCIE3A);
+    dprintf("softpwm led toggle: %u\n", TIMSK3 & (1<<OCIE3A));
+#else
+    TIMSK1 ^= (1<<OCIE1A);
+    dprintf("softpwm led toggle: %u\n", TIMSK1 & (1<<OCIE1A));
+#endif
+}
+
+void softpwm_led_set(uint8_t val) {
+    softpwm_ocr_buff = val;
+}
+
+#ifdef BREATHING_LED_ENABLE
+
+/* Breathing LED brighness(PWM On period) table
+ *
+ * http://www.wolframalpha.com/input/?i=Table%5Bfloor%28%28exp%28sin%28x%2F256*2*pi%2B3%2F2*pi%29%29-1%2Fe%29*%28256%2F%28e-1%2Fe%29%29%29%2C+%7Bx%2C0%2C255%2C1%7D%5D
+ * Table[floor((exp(sin(x/256*2*pi+3/2*pi))-1/e)*(256/(e-1/e))), {x,0,255,1}]
+ * (0..255).each {|x| print ((exp(sin(x/256.0*2*PI+3.0/2*PI))-1/E)*(256/(E-1/E))).to_i, ', ' }
+ */
+static const uint8_t breathing_table[256] PROGMEM = {
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 8, 8, 9, 10, 11, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21, 22, 23, 25, 26, 27, 29, 30, 32, 34, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 56, 58, 61, 63, 66, 68, 71, 74, 77, 80, 83, 86, 89, 92, 95, 98, 102, 105, 108, 112, 116, 119, 123, 126, 130, 134, 138, 142, 145, 149, 153, 157, 161, 165, 169, 173, 176, 180, 184, 188, 192, 195, 199, 203, 206, 210, 213, 216, 219, 223, 226, 228, 231, 234, 236, 239, 241, 243, 245, 247, 248, 250, 251, 252, 253, 254, 255, 255, 255, 255, 255, 255, 255, 254, 253, 252, 251, 250, 248, 247, 245, 243, 241, 239, 236, 234, 231, 228, 226, 223, 219, 216, 213, 210, 206, 203, 199, 195, 192, 188, 184, 180, 176, 173, 169, 165, 161, 157, 153, 149, 145, 142, 138, 134, 130, 126, 123, 119, 116, 112, 108, 105, 102, 98, 95, 92, 89, 86, 83, 80, 77, 74, 71, 68, 66, 63, 61, 58, 56, 53, 51, 49, 47, 45, 43, 41, 39, 37, 35, 34, 32, 30, 29, 27, 26, 25, 23, 22, 21, 19, 18, 17, 16, 15, 14, 13, 12, 11, 11, 10, 9, 8, 8, 7, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+static uint8_t breathing_led_state = 0;
+static uint8_t breathing_led_duration = 0;
+
+void breathing_led_enable(void)
+{
+    breathing_led_state = 1;
+}
+
+void breathing_led_disable(void)
+{
+    breathing_led_state = 0;
+}
+
+void breathing_led_toggle(void)
+{
+    breathing_led_state ^= 1;
+}
+
+void breathing_led_set_duration(uint8_t dur)
+{
+    breathing_led_duration = dur;
+    dprintf("breathing led set duration: %u\n", breathing_led_duration);
+}
+
+#endif
+
+#ifdef SOFTPWM_LED_TIMER3
+ISR(TIMER3_COMPA_vect)
+#else
+ISR(TIMER1_COMPA_vect)
+#endif
+{
+    static uint8_t pwm = 0;
+    pwm++;
+    // LED on
+    if (pwm == 0) {
+        softpwm_led_on();
+        softpwm_ocr = softpwm_ocr_buff;
+    }
+    // LED off
+    if (pwm == softpwm_ocr) {
+        softpwm_led_off();
+    }
+
+#ifdef BREATHING_LED_ENABLE
+    static uint8_t count = 0;
+    static uint8_t index = 0;
+    static uint8_t step = 0;
+    if (breathing_led_state) {
+        count++;
+        if (count > SOFTPWM_LED_FREQ) {
+            count = 0;
+            step++;
+            if (step > breathing_led_duration) {
+                step = 0;
+                softpwm_ocr_buff = pgm_read_byte(&breathing_table[index]);
+                index++;
+            }
+        }
+    }
+#endif
+}
diff --git a/common/softpwm_led.h b/common/softpwm_led.h
new file mode 100644
index 00000000..5236b1df
--- /dev/null
+++ b/common/softpwm_led.h
@@ -0,0 +1,40 @@
+#ifndef SOFTPWM_LED_H
+#define SOFTPWM_LED_H
+
+#ifdef SOFTPWM_LED_ENABLE
+
+void softpwm_led_init(void);
+void softpwm_led_enable(void);
+void softpwm_led_disable(void);
+void softpwm_led_toggle(void);
+void softpwm_led_set(uint8_t val);
+void softpwm_led_on(void);
+void softpwm_led_off(void);
+
+#ifdef BREATHING_LED_ENABLE
+#define breathing_led_init()
+void breathing_led_enable(void);
+void breathing_led_disable(void);
+void breathing_led_toggle(void);
+void breathing_led_set_duration(uint8_t dur);
+#else
+#define breathing_led_init()
+#define breathing_led_enable()
+#define breathing_led_disable()
+#define breathing_led_toggle()
+#define breathing_led_set_duration()
+#endif
+
+#else
+
+#define softpwm_led_init()
+#define softpwm_led_enable()
+#define softpwm_led_disable()
+#define softpwm_led_toggle()
+#define softpwm_led_set()
+#define softpwm_led_on()
+#define softpwm_led_off()
+
+#endif
+
+#endif