I guess I should commit this stuff. Mostly theme related.