Merge gtk and main branch