common files, and change the gtk2 package name so that it no longer looks like a flavor of gtk. Do not forget to add the relevant conflict lines so that updates won't crash.