Moved unit theme code to DecayingUnit