A silly rogue i variable messed some stuff up, and then I discovered an error with themes... but it's all fixed now ^_^
You can see the changes here.
