Fix for mesa theme