Working on themes always makes me think of Blocks. I think a blocks system will be in an upcoming Goal Week very soon.