Added bootstrap icons, changed merging of default values