Grafx theme collapse improved