Got custom gallery merged, need to check working