Code cleanup and new Galleria theme