This thread is very messy. As far as I can see you upgraded your gallery to cpg1.5.20 and now make your theme fully compatible with cpg1.5.x, right?
If so, what's the actual issue? Is there still an issue at all?
If so, what's the actual issue? Is there still an issue at all?