updated theme and cleaning