use individual options instead of dictionary
shortcodes fix
move into subfolder, options fix
move into subfolder, options fix