Better Arrow Theme Handling