Jucer changes + theme fixes