Theme support added for cards