I've officially given up on customizing an s1 layout. I was working on it for about 3 hours last night, smoked about half a pack of cigarettes in frustration and just generally hate overrides. I'm just going with a nice, simple s2 layout, and fuck the customizations. Well, I might tweak a few things, but otherwise, I'm done. So yeah.
Will do an icon post in a second here, mostly just to get them all taken care of.