Cleaned up theme a little more...