Merges Dan's and my space theme