Refined theme and added fallback