Re-commit of the baltdad theme
Trying again to get everything in sync