colorbox / login screen
rebuild minus colorbox
merged conflicts
check conflicts