Tidying up of options after advisory session on irc: Move all RNA code
in Themes.