Fix color scheme, add shortcuts, add rename function