Mad a ton of chnages code cleanup and theme touchups