Cleaned up themes, string formatting

3 jobs for master in 3 minutes and 12 seconds (queued for 1 second)