updating theme and moving code around for more modularity.