Switch to pre-rendered units

This is to enable compositing of units