More theming fixes, lockscreen, borders and Card UI