diff --git a/TODO.md b/TODO.md
index 26cc810..a36f688 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,15 +3,15 @@ Common:
 - [x] Window implementation
 - [x] Fix shader compilation
 - [x] Downscale textures
-- [ ] Simplify geometry
 - [x] Touch controls
 - [x] Keyboard controls
-- [ ] Audio?
 - [x] Menu
 - [x] Config
 - [x] Merge S60v3 and ^3 branches
+- [ ] Simplify geometry
 - [ ] Move map to top left corner
 - [ ] Do something with sprites, they're still taking too much frame time
+- [ ] Audio?
 
 GLES 2.0 specific:
 - [x] Optimize to always run 10+ fps
@@ -23,7 +23,7 @@ GLES 2.0 specific:
 GLES 1.1 specific:
 - [x] Backport to STLport v4
 - [x] GLES 1.1 engine
-- [ ] Keyboard mappings for both QWERTY/12-keys
+- [x] Keyboard mappings for both QWERTY/12-keys
 - [ ] Use pvrtc compression
 
 Issues: