update splash styles
fix conflict and merge
removed BASE reference in utils