Add player theme (at least for debug) & fix bugs