Cleaned theme code