New theme; fixed Shippy's concerns