Wokring on theme, cleaning up..
More cleanup