Reworked Throb and Lamp classes