add theme for datepicker, fixed styles conflicts
refactored css conflict
fixed conflicts after pull