Added theme factory
  Fixed canvas positioning and added some todos