More makeup

Need to make a theme function out of this soon, also remove, merge
duplicated paths