Code cleanup, stub out new Galleria theme