some fixes
cart theming
Search added

Need to fix replace mechanism
Merge remote-tracking branch 'origin/search-fix'