work on themeing and some js