Them work clean up
Theme work clean up