Cleaned up theme code