Further shader rework/optimization