Some cleanup, improving the method names, theme installing code...you know....