added randomize and theme