merge
updated colors, added search