more adjustments, 2012, 2011

Signed-off-by: Zane M. Kolnik <zanematthew@gmail.com>
better support with themes, #409

Signed-off-by: Zane M. Kolnik <zanematthew@gmail.com>