Add default cursor theme, cleanup