Cleaned themes a bit