More 1.6.1 RP support - clean integration with 1.5, 1.4 textures