diff --git a/daemon.py b/daemon.py index c9895f0eb..4d047f44a 100644 --- a/daemon.py +++ b/daemon.py @@ -4387,7 +4387,7 @@ class PubServer(BaseHTTPRequestHandler): if not os.path.isfile(faviconFilename): # default favicon faviconFilename = \ - baseDir + '/img/icons/' + favFilename + baseDir + '/theme/default/icons/' + favFilename if self._etag_exists(faviconFilename): # The file has not changed if debug: @@ -4834,7 +4834,13 @@ class PubServer(BaseHTTPRequestHandler): """ if path.endswith('.png'): mediaStr = path.split('/icons/')[1] - mediaFilename = baseDir + '/img/icons/' + mediaStr + if '/' not in mediaStr: + self._404() + return + theme = mediaStr.split('/')[0] + iconFilename = mediaStr.split('/')[1] + mediaFilename = \ + baseDir + '/theme/' + theme + '/icons/' + iconFilename if self._etag_exists(mediaFilename): # The file has not changed self._304() diff --git a/theme.py b/theme.py index a2387b0f0..548b3e56f 100644 --- a/theme.py +++ b/theme.py @@ -1364,9 +1364,9 @@ def setNewsAvatar(baseDir: str, name: str, """Sets the avatar for the news account """ nickname = 'news' - newFilename = baseDir + '/img/icons/' + name + '/avatar_news.png' + newFilename = baseDir + '/theme/' + name + '/icons/avatar_news.png' if not os.path.isfile(newFilename): - newFilename = baseDir + '/img/icons/avatar_news.png' + newFilename = baseDir + '/theme/default/icons/avatar_news.png' if not os.path.isfile(newFilename): return avatarFilename = \ @@ -1409,7 +1409,7 @@ def setTheme(baseDir: str, name: str, domain: str) -> bool: # set the news avatar newsAvatarThemeFilename = \ - baseDir + '/img/icons/' + name + '/avatar_news.png' + baseDir + '/theme/' + name + '/icons/avatar_news.png' if os.path.isfile(newsAvatarThemeFilename): newsAvatarFilename = \ baseDir + '/accounts/news@' + domain + '/avatar.png' diff --git a/img/icons/blue/add.png b/theme/blue/icons/add.png similarity index 100% rename from img/icons/blue/add.png rename to theme/blue/icons/add.png diff --git a/img/icons/blue/avatar_news.png b/theme/blue/icons/avatar_news.png similarity index 100% rename from img/icons/blue/avatar_news.png rename to theme/blue/icons/avatar_news.png diff --git a/img/icons/blue/bookmark.png b/theme/blue/icons/bookmark.png similarity index 100% rename from img/icons/blue/bookmark.png rename to theme/blue/icons/bookmark.png diff --git a/img/icons/blue/bookmark_inactive.png b/theme/blue/icons/bookmark_inactive.png similarity index 100% rename from img/icons/blue/bookmark_inactive.png rename to theme/blue/icons/bookmark_inactive.png diff --git a/img/icons/blue/calendar.png b/theme/blue/icons/calendar.png similarity index 100% rename from img/icons/blue/calendar.png rename to theme/blue/icons/calendar.png diff --git a/img/icons/blue/calendar_notify.png b/theme/blue/icons/calendar_notify.png similarity index 100% rename from img/icons/blue/calendar_notify.png rename to theme/blue/icons/calendar_notify.png diff --git a/img/icons/blue/delete.png b/theme/blue/icons/delete.png similarity index 100% rename from img/icons/blue/delete.png rename to theme/blue/icons/delete.png diff --git a/img/icons/blue/dm.png b/theme/blue/icons/dm.png similarity index 100% rename from img/icons/blue/dm.png rename to theme/blue/icons/dm.png diff --git a/img/icons/blue/download.png b/theme/blue/icons/download.png similarity index 100% rename from img/icons/blue/download.png rename to theme/blue/icons/download.png diff --git a/img/icons/blue/edit.png b/theme/blue/icons/edit.png similarity index 100% rename from img/icons/blue/edit.png rename to theme/blue/icons/edit.png diff --git a/img/icons/blue/edit_notify.png b/theme/blue/icons/edit_notify.png similarity index 100% rename from img/icons/blue/edit_notify.png rename to theme/blue/icons/edit_notify.png diff --git a/img/icons/blue/like.png b/theme/blue/icons/like.png similarity index 100% rename from img/icons/blue/like.png rename to theme/blue/icons/like.png diff --git a/img/icons/blue/like_inactive.png b/theme/blue/icons/like_inactive.png similarity index 100% rename from img/icons/blue/like_inactive.png rename to theme/blue/icons/like_inactive.png diff --git a/img/icons/blue/links.png b/theme/blue/icons/links.png similarity index 100% rename from img/icons/blue/links.png rename to theme/blue/icons/links.png diff --git a/img/icons/blue/logorss.png b/theme/blue/icons/logorss.png similarity index 100% rename from img/icons/blue/logorss.png rename to theme/blue/icons/logorss.png diff --git a/img/icons/blue/logout.png b/theme/blue/icons/logout.png similarity index 100% rename from img/icons/blue/logout.png rename to theme/blue/icons/logout.png diff --git a/img/icons/blue/mute.png b/theme/blue/icons/mute.png similarity index 100% rename from img/icons/blue/mute.png rename to theme/blue/icons/mute.png diff --git a/img/icons/blue/new.png b/theme/blue/icons/new.png similarity index 100% rename from img/icons/blue/new.png rename to theme/blue/icons/new.png diff --git a/img/icons/blue/newpost.png b/theme/blue/icons/newpost.png similarity index 100% rename from img/icons/blue/newpost.png rename to theme/blue/icons/newpost.png diff --git a/img/icons/blue/newswire.png b/theme/blue/icons/newswire.png similarity index 100% rename from img/icons/blue/newswire.png rename to theme/blue/icons/newswire.png diff --git a/img/icons/blue/pagedown.png b/theme/blue/icons/pagedown.png similarity index 100% rename from img/icons/blue/pagedown.png rename to theme/blue/icons/pagedown.png diff --git a/img/icons/blue/pageup.png b/theme/blue/icons/pageup.png similarity index 100% rename from img/icons/blue/pageup.png rename to theme/blue/icons/pageup.png diff --git a/img/icons/blue/person.png b/theme/blue/icons/person.png similarity index 100% rename from img/icons/blue/person.png rename to theme/blue/icons/person.png diff --git a/img/icons/blue/prev.png b/theme/blue/icons/prev.png similarity index 100% rename from img/icons/blue/prev.png rename to theme/blue/icons/prev.png diff --git a/img/icons/blue/publish.png b/theme/blue/icons/publish.png similarity index 100% rename from img/icons/blue/publish.png rename to theme/blue/icons/publish.png diff --git a/img/icons/blue/qrcode.png b/theme/blue/icons/qrcode.png similarity index 100% rename from img/icons/blue/qrcode.png rename to theme/blue/icons/qrcode.png diff --git a/img/icons/blue/repeat.png b/theme/blue/icons/repeat.png similarity index 100% rename from img/icons/blue/repeat.png rename to theme/blue/icons/repeat.png diff --git a/img/icons/blue/repeat_inactive.png b/theme/blue/icons/repeat_inactive.png similarity index 100% rename from img/icons/blue/repeat_inactive.png rename to theme/blue/icons/repeat_inactive.png diff --git a/img/icons/blue/reply.png b/theme/blue/icons/reply.png similarity index 100% rename from img/icons/blue/reply.png rename to theme/blue/icons/reply.png diff --git a/img/icons/blue/rss3.png b/theme/blue/icons/rss3.png similarity index 100% rename from img/icons/blue/rss3.png rename to theme/blue/icons/rss3.png diff --git a/img/icons/blue/scope_blog.png b/theme/blue/icons/scope_blog.png similarity index 100% rename from img/icons/blue/scope_blog.png rename to theme/blue/icons/scope_blog.png diff --git a/img/icons/blue/scope_dm.png b/theme/blue/icons/scope_dm.png similarity index 100% rename from img/icons/blue/scope_dm.png rename to theme/blue/icons/scope_dm.png diff --git a/img/icons/blue/scope_event.png b/theme/blue/icons/scope_event.png similarity index 100% rename from img/icons/blue/scope_event.png rename to theme/blue/icons/scope_event.png diff --git a/img/icons/blue/scope_followers.png b/theme/blue/icons/scope_followers.png similarity index 100% rename from img/icons/blue/scope_followers.png rename to theme/blue/icons/scope_followers.png diff --git a/img/icons/blue/scope_public.png b/theme/blue/icons/scope_public.png similarity index 100% rename from img/icons/blue/scope_public.png rename to theme/blue/icons/scope_public.png diff --git a/img/icons/blue/scope_question.png b/theme/blue/icons/scope_question.png similarity index 100% rename from img/icons/blue/scope_question.png rename to theme/blue/icons/scope_question.png diff --git a/img/icons/blue/scope_reminder.png b/theme/blue/icons/scope_reminder.png similarity index 100% rename from img/icons/blue/scope_reminder.png rename to theme/blue/icons/scope_reminder.png diff --git a/img/icons/blue/scope_report.png b/theme/blue/icons/scope_report.png similarity index 100% rename from img/icons/blue/scope_report.png rename to theme/blue/icons/scope_report.png diff --git a/img/icons/blue/scope_share.png b/theme/blue/icons/scope_share.png similarity index 100% rename from img/icons/blue/scope_share.png rename to theme/blue/icons/scope_share.png diff --git a/img/icons/blue/scope_unlisted.png b/theme/blue/icons/scope_unlisted.png similarity index 100% rename from img/icons/blue/scope_unlisted.png rename to theme/blue/icons/scope_unlisted.png diff --git a/img/icons/blue/search.png b/theme/blue/icons/search.png similarity index 100% rename from img/icons/blue/search.png rename to theme/blue/icons/search.png diff --git a/img/icons/blue/showhide.png b/theme/blue/icons/showhide.png similarity index 100% rename from img/icons/blue/showhide.png rename to theme/blue/icons/showhide.png diff --git a/img/icons/blue/unmute.png b/theme/blue/icons/unmute.png similarity index 100% rename from img/icons/blue/unmute.png rename to theme/blue/icons/unmute.png diff --git a/img/icons/blue/vote.png b/theme/blue/icons/vote.png similarity index 100% rename from img/icons/blue/vote.png rename to theme/blue/icons/vote.png diff --git a/img/icons/hacker/add.png b/theme/hacker/icons/add.png similarity index 100% rename from img/icons/hacker/add.png rename to theme/hacker/icons/add.png diff --git a/img/icons/hacker/avatar_news.png b/theme/hacker/icons/avatar_news.png similarity index 100% rename from img/icons/hacker/avatar_news.png rename to theme/hacker/icons/avatar_news.png diff --git a/img/icons/hacker/bookmark.png b/theme/hacker/icons/bookmark.png similarity index 100% rename from img/icons/hacker/bookmark.png rename to theme/hacker/icons/bookmark.png diff --git a/img/icons/hacker/bookmark_inactive.png b/theme/hacker/icons/bookmark_inactive.png similarity index 100% rename from img/icons/hacker/bookmark_inactive.png rename to theme/hacker/icons/bookmark_inactive.png diff --git a/img/icons/hacker/calendar.png b/theme/hacker/icons/calendar.png similarity index 100% rename from img/icons/hacker/calendar.png rename to theme/hacker/icons/calendar.png diff --git a/img/icons/hacker/calendar_notify.png b/theme/hacker/icons/calendar_notify.png similarity index 100% rename from img/icons/hacker/calendar_notify.png rename to theme/hacker/icons/calendar_notify.png diff --git a/img/icons/hacker/delete.png b/theme/hacker/icons/delete.png similarity index 100% rename from img/icons/hacker/delete.png rename to theme/hacker/icons/delete.png diff --git a/img/icons/hacker/dm.png b/theme/hacker/icons/dm.png similarity index 100% rename from img/icons/hacker/dm.png rename to theme/hacker/icons/dm.png diff --git a/img/icons/hacker/download.png b/theme/hacker/icons/download.png similarity index 100% rename from img/icons/hacker/download.png rename to theme/hacker/icons/download.png diff --git a/img/icons/hacker/edit.png b/theme/hacker/icons/edit.png similarity index 100% rename from img/icons/hacker/edit.png rename to theme/hacker/icons/edit.png diff --git a/img/icons/hacker/edit_notify.png b/theme/hacker/icons/edit_notify.png similarity index 100% rename from img/icons/hacker/edit_notify.png rename to theme/hacker/icons/edit_notify.png diff --git a/img/icons/hacker/like.png b/theme/hacker/icons/like.png similarity index 100% rename from img/icons/hacker/like.png rename to theme/hacker/icons/like.png diff --git a/img/icons/hacker/like_inactive.png b/theme/hacker/icons/like_inactive.png similarity index 100% rename from img/icons/hacker/like_inactive.png rename to theme/hacker/icons/like_inactive.png diff --git a/img/icons/hacker/links.png b/theme/hacker/icons/links.png similarity index 100% rename from img/icons/hacker/links.png rename to theme/hacker/icons/links.png diff --git a/img/icons/hacker/logorss.png b/theme/hacker/icons/logorss.png similarity index 100% rename from img/icons/hacker/logorss.png rename to theme/hacker/icons/logorss.png diff --git a/img/icons/hacker/logout.png b/theme/hacker/icons/logout.png similarity index 100% rename from img/icons/hacker/logout.png rename to theme/hacker/icons/logout.png diff --git a/img/icons/hacker/mute.png b/theme/hacker/icons/mute.png similarity index 100% rename from img/icons/hacker/mute.png rename to theme/hacker/icons/mute.png diff --git a/img/icons/hacker/new.png b/theme/hacker/icons/new.png similarity index 100% rename from img/icons/hacker/new.png rename to theme/hacker/icons/new.png diff --git a/img/icons/hacker/newpost.png b/theme/hacker/icons/newpost.png similarity index 100% rename from img/icons/hacker/newpost.png rename to theme/hacker/icons/newpost.png diff --git a/img/icons/hacker/newswire.png b/theme/hacker/icons/newswire.png similarity index 100% rename from img/icons/hacker/newswire.png rename to theme/hacker/icons/newswire.png diff --git a/img/icons/hacker/pagedown.png b/theme/hacker/icons/pagedown.png similarity index 100% rename from img/icons/hacker/pagedown.png rename to theme/hacker/icons/pagedown.png diff --git a/img/icons/hacker/pageup.png b/theme/hacker/icons/pageup.png similarity index 100% rename from img/icons/hacker/pageup.png rename to theme/hacker/icons/pageup.png diff --git a/img/icons/hacker/person.png b/theme/hacker/icons/person.png similarity index 100% rename from img/icons/hacker/person.png rename to theme/hacker/icons/person.png diff --git a/img/icons/hacker/prev.png b/theme/hacker/icons/prev.png similarity index 100% rename from img/icons/hacker/prev.png rename to theme/hacker/icons/prev.png diff --git a/img/icons/hacker/publish.png b/theme/hacker/icons/publish.png similarity index 100% rename from img/icons/hacker/publish.png rename to theme/hacker/icons/publish.png diff --git a/img/icons/hacker/qrcode.png b/theme/hacker/icons/qrcode.png similarity index 100% rename from img/icons/hacker/qrcode.png rename to theme/hacker/icons/qrcode.png diff --git a/img/icons/hacker/repeat.png b/theme/hacker/icons/repeat.png similarity index 100% rename from img/icons/hacker/repeat.png rename to theme/hacker/icons/repeat.png diff --git a/img/icons/hacker/repeat_inactive.png b/theme/hacker/icons/repeat_inactive.png similarity index 100% rename from img/icons/hacker/repeat_inactive.png rename to theme/hacker/icons/repeat_inactive.png diff --git a/img/icons/hacker/reply.png b/theme/hacker/icons/reply.png similarity index 100% rename from img/icons/hacker/reply.png rename to theme/hacker/icons/reply.png diff --git a/img/icons/hacker/rss3.png b/theme/hacker/icons/rss3.png similarity index 100% rename from img/icons/hacker/rss3.png rename to theme/hacker/icons/rss3.png diff --git a/img/icons/hacker/scope_blog.png b/theme/hacker/icons/scope_blog.png similarity index 100% rename from img/icons/hacker/scope_blog.png rename to theme/hacker/icons/scope_blog.png diff --git a/img/icons/hacker/scope_dm.png b/theme/hacker/icons/scope_dm.png similarity index 100% rename from img/icons/hacker/scope_dm.png rename to theme/hacker/icons/scope_dm.png diff --git a/img/icons/hacker/scope_event.png b/theme/hacker/icons/scope_event.png similarity index 100% rename from img/icons/hacker/scope_event.png rename to theme/hacker/icons/scope_event.png diff --git a/img/icons/hacker/scope_followers.png b/theme/hacker/icons/scope_followers.png similarity index 100% rename from img/icons/hacker/scope_followers.png rename to theme/hacker/icons/scope_followers.png diff --git a/img/icons/hacker/scope_public.png b/theme/hacker/icons/scope_public.png similarity index 100% rename from img/icons/hacker/scope_public.png rename to theme/hacker/icons/scope_public.png diff --git a/img/icons/hacker/scope_question.png b/theme/hacker/icons/scope_question.png similarity index 100% rename from img/icons/hacker/scope_question.png rename to theme/hacker/icons/scope_question.png diff --git a/img/icons/hacker/scope_reminder.png b/theme/hacker/icons/scope_reminder.png similarity index 100% rename from img/icons/hacker/scope_reminder.png rename to theme/hacker/icons/scope_reminder.png diff --git a/img/icons/hacker/scope_report.png b/theme/hacker/icons/scope_report.png similarity index 100% rename from img/icons/hacker/scope_report.png rename to theme/hacker/icons/scope_report.png diff --git a/img/icons/hacker/scope_share.png b/theme/hacker/icons/scope_share.png similarity index 100% rename from img/icons/hacker/scope_share.png rename to theme/hacker/icons/scope_share.png diff --git a/img/icons/hacker/scope_unlisted.png b/theme/hacker/icons/scope_unlisted.png similarity index 100% rename from img/icons/hacker/scope_unlisted.png rename to theme/hacker/icons/scope_unlisted.png diff --git a/img/icons/hacker/search.png b/theme/hacker/icons/search.png similarity index 100% rename from img/icons/hacker/search.png rename to theme/hacker/icons/search.png diff --git a/img/icons/hacker/showhide.png b/theme/hacker/icons/showhide.png similarity index 100% rename from img/icons/hacker/showhide.png rename to theme/hacker/icons/showhide.png diff --git a/img/icons/hacker/unmute.png b/theme/hacker/icons/unmute.png similarity index 100% rename from img/icons/hacker/unmute.png rename to theme/hacker/icons/unmute.png diff --git a/img/icons/hacker/vote.png b/theme/hacker/icons/vote.png similarity index 100% rename from img/icons/hacker/vote.png rename to theme/hacker/icons/vote.png diff --git a/img/icons/henge/add.png b/theme/henge/icons/add.png similarity index 100% rename from img/icons/henge/add.png rename to theme/henge/icons/add.png diff --git a/img/icons/henge/avatar_news.png b/theme/henge/icons/avatar_news.png similarity index 100% rename from img/icons/henge/avatar_news.png rename to theme/henge/icons/avatar_news.png diff --git a/img/icons/henge/bookmark.png b/theme/henge/icons/bookmark.png similarity index 100% rename from img/icons/henge/bookmark.png rename to theme/henge/icons/bookmark.png diff --git a/img/icons/henge/bookmark_inactive.png b/theme/henge/icons/bookmark_inactive.png similarity index 100% rename from img/icons/henge/bookmark_inactive.png rename to theme/henge/icons/bookmark_inactive.png diff --git a/img/icons/henge/calendar.png b/theme/henge/icons/calendar.png similarity index 100% rename from img/icons/henge/calendar.png rename to theme/henge/icons/calendar.png diff --git a/img/icons/henge/calendar_notify.png b/theme/henge/icons/calendar_notify.png similarity index 100% rename from img/icons/henge/calendar_notify.png rename to theme/henge/icons/calendar_notify.png diff --git a/img/icons/henge/delete.png b/theme/henge/icons/delete.png similarity index 100% rename from img/icons/henge/delete.png rename to theme/henge/icons/delete.png diff --git a/img/icons/henge/dm.png b/theme/henge/icons/dm.png similarity index 100% rename from img/icons/henge/dm.png rename to theme/henge/icons/dm.png diff --git a/img/icons/henge/download.png b/theme/henge/icons/download.png similarity index 100% rename from img/icons/henge/download.png rename to theme/henge/icons/download.png diff --git a/img/icons/henge/edit.png b/theme/henge/icons/edit.png similarity index 100% rename from img/icons/henge/edit.png rename to theme/henge/icons/edit.png diff --git a/img/icons/henge/edit_notify.png b/theme/henge/icons/edit_notify.png similarity index 100% rename from img/icons/henge/edit_notify.png rename to theme/henge/icons/edit_notify.png diff --git a/img/icons/henge/like.png b/theme/henge/icons/like.png similarity index 100% rename from img/icons/henge/like.png rename to theme/henge/icons/like.png diff --git a/img/icons/henge/like_inactive.png b/theme/henge/icons/like_inactive.png similarity index 100% rename from img/icons/henge/like_inactive.png rename to theme/henge/icons/like_inactive.png diff --git a/img/icons/henge/links.png b/theme/henge/icons/links.png similarity index 100% rename from img/icons/henge/links.png rename to theme/henge/icons/links.png diff --git a/img/icons/henge/logorss.png b/theme/henge/icons/logorss.png similarity index 100% rename from img/icons/henge/logorss.png rename to theme/henge/icons/logorss.png diff --git a/img/icons/henge/logout.png b/theme/henge/icons/logout.png similarity index 100% rename from img/icons/henge/logout.png rename to theme/henge/icons/logout.png diff --git a/img/icons/henge/mute.png b/theme/henge/icons/mute.png similarity index 100% rename from img/icons/henge/mute.png rename to theme/henge/icons/mute.png diff --git a/img/icons/henge/new.png b/theme/henge/icons/new.png similarity index 100% rename from img/icons/henge/new.png rename to theme/henge/icons/new.png diff --git a/img/icons/henge/newpost.png b/theme/henge/icons/newpost.png similarity index 100% rename from img/icons/henge/newpost.png rename to theme/henge/icons/newpost.png diff --git a/img/icons/henge/newswire.png b/theme/henge/icons/newswire.png similarity index 100% rename from img/icons/henge/newswire.png rename to theme/henge/icons/newswire.png diff --git a/img/icons/henge/pagedown.png b/theme/henge/icons/pagedown.png similarity index 100% rename from img/icons/henge/pagedown.png rename to theme/henge/icons/pagedown.png diff --git a/img/icons/henge/pageup.png b/theme/henge/icons/pageup.png similarity index 100% rename from img/icons/henge/pageup.png rename to theme/henge/icons/pageup.png diff --git a/img/icons/henge/person.png b/theme/henge/icons/person.png similarity index 100% rename from img/icons/henge/person.png rename to theme/henge/icons/person.png diff --git a/img/icons/henge/prev.png b/theme/henge/icons/prev.png similarity index 100% rename from img/icons/henge/prev.png rename to theme/henge/icons/prev.png diff --git a/img/icons/henge/publish.png b/theme/henge/icons/publish.png similarity index 100% rename from img/icons/henge/publish.png rename to theme/henge/icons/publish.png diff --git a/img/icons/henge/repeat.png b/theme/henge/icons/repeat.png similarity index 100% rename from img/icons/henge/repeat.png rename to theme/henge/icons/repeat.png diff --git a/img/icons/henge/repeat_inactive.png b/theme/henge/icons/repeat_inactive.png similarity index 100% rename from img/icons/henge/repeat_inactive.png rename to theme/henge/icons/repeat_inactive.png diff --git a/img/icons/henge/reply.png b/theme/henge/icons/reply.png similarity index 100% rename from img/icons/henge/reply.png rename to theme/henge/icons/reply.png diff --git a/img/icons/henge/rss3.png b/theme/henge/icons/rss3.png similarity index 100% rename from img/icons/henge/rss3.png rename to theme/henge/icons/rss3.png diff --git a/img/icons/henge/scope_blog.png b/theme/henge/icons/scope_blog.png similarity index 100% rename from img/icons/henge/scope_blog.png rename to theme/henge/icons/scope_blog.png diff --git a/img/icons/henge/scope_dm.png b/theme/henge/icons/scope_dm.png similarity index 100% rename from img/icons/henge/scope_dm.png rename to theme/henge/icons/scope_dm.png diff --git a/img/icons/henge/scope_event.png b/theme/henge/icons/scope_event.png similarity index 100% rename from img/icons/henge/scope_event.png rename to theme/henge/icons/scope_event.png diff --git a/img/icons/henge/scope_followers.png b/theme/henge/icons/scope_followers.png similarity index 100% rename from img/icons/henge/scope_followers.png rename to theme/henge/icons/scope_followers.png diff --git a/img/icons/henge/scope_public.png b/theme/henge/icons/scope_public.png similarity index 100% rename from img/icons/henge/scope_public.png rename to theme/henge/icons/scope_public.png diff --git a/img/icons/henge/scope_question.png b/theme/henge/icons/scope_question.png similarity index 100% rename from img/icons/henge/scope_question.png rename to theme/henge/icons/scope_question.png diff --git a/img/icons/henge/scope_reminder.png b/theme/henge/icons/scope_reminder.png similarity index 100% rename from img/icons/henge/scope_reminder.png rename to theme/henge/icons/scope_reminder.png diff --git a/img/icons/henge/scope_report.png b/theme/henge/icons/scope_report.png similarity index 100% rename from img/icons/henge/scope_report.png rename to theme/henge/icons/scope_report.png diff --git a/img/icons/henge/scope_share.png b/theme/henge/icons/scope_share.png similarity index 100% rename from img/icons/henge/scope_share.png rename to theme/henge/icons/scope_share.png diff --git a/img/icons/henge/scope_unlisted.png b/theme/henge/icons/scope_unlisted.png similarity index 100% rename from img/icons/henge/scope_unlisted.png rename to theme/henge/icons/scope_unlisted.png diff --git a/img/icons/henge/search.png b/theme/henge/icons/search.png similarity index 100% rename from img/icons/henge/search.png rename to theme/henge/icons/search.png diff --git a/img/icons/henge/showhide.png b/theme/henge/icons/showhide.png similarity index 100% rename from img/icons/henge/showhide.png rename to theme/henge/icons/showhide.png diff --git a/img/icons/henge/unmute.png b/theme/henge/icons/unmute.png similarity index 100% rename from img/icons/henge/unmute.png rename to theme/henge/icons/unmute.png diff --git a/img/icons/henge/vote.png b/theme/henge/icons/vote.png similarity index 100% rename from img/icons/henge/vote.png rename to theme/henge/icons/vote.png diff --git a/img/icons/indymediaclassic/add.png b/theme/indymediaclassic/icons/add.png similarity index 100% rename from img/icons/indymediaclassic/add.png rename to theme/indymediaclassic/icons/add.png diff --git a/img/icons/indymediaclassic/avatar_news.png b/theme/indymediaclassic/icons/avatar_news.png similarity index 100% rename from img/icons/indymediaclassic/avatar_news.png rename to theme/indymediaclassic/icons/avatar_news.png diff --git a/img/icons/indymediaclassic/bookmark.png b/theme/indymediaclassic/icons/bookmark.png similarity index 100% rename from img/icons/indymediaclassic/bookmark.png rename to theme/indymediaclassic/icons/bookmark.png diff --git a/img/icons/indymediaclassic/bookmark_inactive.png b/theme/indymediaclassic/icons/bookmark_inactive.png similarity index 100% rename from img/icons/indymediaclassic/bookmark_inactive.png rename to theme/indymediaclassic/icons/bookmark_inactive.png diff --git a/img/icons/indymediaclassic/calendar.png b/theme/indymediaclassic/icons/calendar.png similarity index 100% rename from img/icons/indymediaclassic/calendar.png rename to theme/indymediaclassic/icons/calendar.png diff --git a/img/icons/indymediaclassic/calendar_notify.png b/theme/indymediaclassic/icons/calendar_notify.png similarity index 100% rename from img/icons/indymediaclassic/calendar_notify.png rename to theme/indymediaclassic/icons/calendar_notify.png diff --git a/img/icons/indymediaclassic/delete.png b/theme/indymediaclassic/icons/delete.png similarity index 100% rename from img/icons/indymediaclassic/delete.png rename to theme/indymediaclassic/icons/delete.png diff --git a/img/icons/indymediaclassic/dm.png b/theme/indymediaclassic/icons/dm.png similarity index 100% rename from img/icons/indymediaclassic/dm.png rename to theme/indymediaclassic/icons/dm.png diff --git a/img/icons/indymediaclassic/download.png b/theme/indymediaclassic/icons/download.png similarity index 100% rename from img/icons/indymediaclassic/download.png rename to theme/indymediaclassic/icons/download.png diff --git a/img/icons/indymediaclassic/edit.png b/theme/indymediaclassic/icons/edit.png similarity index 100% rename from img/icons/indymediaclassic/edit.png rename to theme/indymediaclassic/icons/edit.png diff --git a/img/icons/indymediaclassic/edit_notify.png b/theme/indymediaclassic/icons/edit_notify.png similarity index 100% rename from img/icons/indymediaclassic/edit_notify.png rename to theme/indymediaclassic/icons/edit_notify.png diff --git a/img/icons/indymediaclassic/like.png b/theme/indymediaclassic/icons/like.png similarity index 100% rename from img/icons/indymediaclassic/like.png rename to theme/indymediaclassic/icons/like.png diff --git a/img/icons/indymediaclassic/like_inactive.png b/theme/indymediaclassic/icons/like_inactive.png similarity index 100% rename from img/icons/indymediaclassic/like_inactive.png rename to theme/indymediaclassic/icons/like_inactive.png diff --git a/img/icons/indymediaclassic/links.png b/theme/indymediaclassic/icons/links.png similarity index 100% rename from img/icons/indymediaclassic/links.png rename to theme/indymediaclassic/icons/links.png diff --git a/img/icons/indymediaclassic/logorss.png b/theme/indymediaclassic/icons/logorss.png similarity index 100% rename from img/icons/indymediaclassic/logorss.png rename to theme/indymediaclassic/icons/logorss.png diff --git a/img/icons/indymediaclassic/logout.png b/theme/indymediaclassic/icons/logout.png similarity index 100% rename from img/icons/indymediaclassic/logout.png rename to theme/indymediaclassic/icons/logout.png diff --git a/img/icons/indymediaclassic/mute.png b/theme/indymediaclassic/icons/mute.png similarity index 100% rename from img/icons/indymediaclassic/mute.png rename to theme/indymediaclassic/icons/mute.png diff --git a/img/icons/indymediaclassic/new.png b/theme/indymediaclassic/icons/new.png similarity index 100% rename from img/icons/indymediaclassic/new.png rename to theme/indymediaclassic/icons/new.png diff --git a/img/icons/indymediaclassic/newpost.png b/theme/indymediaclassic/icons/newpost.png similarity index 100% rename from img/icons/indymediaclassic/newpost.png rename to theme/indymediaclassic/icons/newpost.png diff --git a/img/icons/indymediaclassic/newswire.png b/theme/indymediaclassic/icons/newswire.png similarity index 100% rename from img/icons/indymediaclassic/newswire.png rename to theme/indymediaclassic/icons/newswire.png diff --git a/img/icons/indymediaclassic/pagedown.png b/theme/indymediaclassic/icons/pagedown.png similarity index 100% rename from img/icons/indymediaclassic/pagedown.png rename to theme/indymediaclassic/icons/pagedown.png diff --git a/img/icons/indymediaclassic/pageup.png b/theme/indymediaclassic/icons/pageup.png similarity index 100% rename from img/icons/indymediaclassic/pageup.png rename to theme/indymediaclassic/icons/pageup.png diff --git a/img/icons/indymediaclassic/person.png b/theme/indymediaclassic/icons/person.png similarity index 100% rename from img/icons/indymediaclassic/person.png rename to theme/indymediaclassic/icons/person.png diff --git a/img/icons/indymediaclassic/prev.png b/theme/indymediaclassic/icons/prev.png similarity index 100% rename from img/icons/indymediaclassic/prev.png rename to theme/indymediaclassic/icons/prev.png diff --git a/img/icons/indymediaclassic/publish.png b/theme/indymediaclassic/icons/publish.png similarity index 100% rename from img/icons/indymediaclassic/publish.png rename to theme/indymediaclassic/icons/publish.png diff --git a/img/icons/indymediaclassic/qrcode.png b/theme/indymediaclassic/icons/qrcode.png similarity index 100% rename from img/icons/indymediaclassic/qrcode.png rename to theme/indymediaclassic/icons/qrcode.png diff --git a/img/icons/indymediaclassic/repeat.png b/theme/indymediaclassic/icons/repeat.png similarity index 100% rename from img/icons/indymediaclassic/repeat.png rename to theme/indymediaclassic/icons/repeat.png diff --git a/img/icons/indymediaclassic/repeat_inactive.png b/theme/indymediaclassic/icons/repeat_inactive.png similarity index 100% rename from img/icons/indymediaclassic/repeat_inactive.png rename to theme/indymediaclassic/icons/repeat_inactive.png diff --git a/img/icons/indymediaclassic/reply.png b/theme/indymediaclassic/icons/reply.png similarity index 100% rename from img/icons/indymediaclassic/reply.png rename to theme/indymediaclassic/icons/reply.png diff --git a/img/icons/indymediaclassic/rss3.png b/theme/indymediaclassic/icons/rss3.png similarity index 100% rename from img/icons/indymediaclassic/rss3.png rename to theme/indymediaclassic/icons/rss3.png diff --git a/img/icons/indymediaclassic/scope_blog.png b/theme/indymediaclassic/icons/scope_blog.png similarity index 100% rename from img/icons/indymediaclassic/scope_blog.png rename to theme/indymediaclassic/icons/scope_blog.png diff --git a/img/icons/indymediaclassic/scope_dm.png b/theme/indymediaclassic/icons/scope_dm.png similarity index 100% rename from img/icons/indymediaclassic/scope_dm.png rename to theme/indymediaclassic/icons/scope_dm.png diff --git a/img/icons/indymediaclassic/scope_event.png b/theme/indymediaclassic/icons/scope_event.png similarity index 100% rename from img/icons/indymediaclassic/scope_event.png rename to theme/indymediaclassic/icons/scope_event.png diff --git a/img/icons/indymediaclassic/scope_followers.png b/theme/indymediaclassic/icons/scope_followers.png similarity index 100% rename from img/icons/indymediaclassic/scope_followers.png rename to theme/indymediaclassic/icons/scope_followers.png diff --git a/img/icons/indymediaclassic/scope_public.png b/theme/indymediaclassic/icons/scope_public.png similarity index 100% rename from img/icons/indymediaclassic/scope_public.png rename to theme/indymediaclassic/icons/scope_public.png diff --git a/img/icons/indymediaclassic/scope_question.png b/theme/indymediaclassic/icons/scope_question.png similarity index 100% rename from img/icons/indymediaclassic/scope_question.png rename to theme/indymediaclassic/icons/scope_question.png diff --git a/img/icons/indymediaclassic/scope_reminder.png b/theme/indymediaclassic/icons/scope_reminder.png similarity index 100% rename from img/icons/indymediaclassic/scope_reminder.png rename to theme/indymediaclassic/icons/scope_reminder.png diff --git a/img/icons/indymediaclassic/scope_report.png b/theme/indymediaclassic/icons/scope_report.png similarity index 100% rename from img/icons/indymediaclassic/scope_report.png rename to theme/indymediaclassic/icons/scope_report.png diff --git a/img/icons/indymediaclassic/scope_share.png b/theme/indymediaclassic/icons/scope_share.png similarity index 100% rename from img/icons/indymediaclassic/scope_share.png rename to theme/indymediaclassic/icons/scope_share.png diff --git a/img/icons/indymediaclassic/scope_unlisted.png b/theme/indymediaclassic/icons/scope_unlisted.png similarity index 100% rename from img/icons/indymediaclassic/scope_unlisted.png rename to theme/indymediaclassic/icons/scope_unlisted.png diff --git a/img/icons/indymediaclassic/search.png b/theme/indymediaclassic/icons/search.png similarity index 100% rename from img/icons/indymediaclassic/search.png rename to theme/indymediaclassic/icons/search.png diff --git a/img/icons/indymediaclassic/showhide.png b/theme/indymediaclassic/icons/showhide.png similarity index 100% rename from img/icons/indymediaclassic/showhide.png rename to theme/indymediaclassic/icons/showhide.png diff --git a/img/icons/indymediaclassic/unmute.png b/theme/indymediaclassic/icons/unmute.png similarity index 100% rename from img/icons/indymediaclassic/unmute.png rename to theme/indymediaclassic/icons/unmute.png diff --git a/img/icons/indymediaclassic/vote.png b/theme/indymediaclassic/icons/vote.png similarity index 100% rename from img/icons/indymediaclassic/vote.png rename to theme/indymediaclassic/icons/vote.png diff --git a/img/icons/indymediamodern/add.png b/theme/indymediamodern/icons/add.png similarity index 100% rename from img/icons/indymediamodern/add.png rename to theme/indymediamodern/icons/add.png diff --git a/img/icons/indymediamodern/avatar_news.png b/theme/indymediamodern/icons/avatar_news.png similarity index 100% rename from img/icons/indymediamodern/avatar_news.png rename to theme/indymediamodern/icons/avatar_news.png diff --git a/img/icons/indymediamodern/bookmark.png b/theme/indymediamodern/icons/bookmark.png similarity index 100% rename from img/icons/indymediamodern/bookmark.png rename to theme/indymediamodern/icons/bookmark.png diff --git a/img/icons/indymediamodern/bookmark_inactive.png b/theme/indymediamodern/icons/bookmark_inactive.png similarity index 100% rename from img/icons/indymediamodern/bookmark_inactive.png rename to theme/indymediamodern/icons/bookmark_inactive.png diff --git a/img/icons/indymediamodern/calendar.png b/theme/indymediamodern/icons/calendar.png similarity index 100% rename from img/icons/indymediamodern/calendar.png rename to theme/indymediamodern/icons/calendar.png diff --git a/img/icons/indymediamodern/calendar_notify.png b/theme/indymediamodern/icons/calendar_notify.png similarity index 100% rename from img/icons/indymediamodern/calendar_notify.png rename to theme/indymediamodern/icons/calendar_notify.png diff --git a/img/icons/indymediamodern/delete.png b/theme/indymediamodern/icons/delete.png similarity index 100% rename from img/icons/indymediamodern/delete.png rename to theme/indymediamodern/icons/delete.png diff --git a/img/icons/indymediamodern/dm.png b/theme/indymediamodern/icons/dm.png similarity index 100% rename from img/icons/indymediamodern/dm.png rename to theme/indymediamodern/icons/dm.png diff --git a/img/icons/indymediamodern/download.png b/theme/indymediamodern/icons/download.png similarity index 100% rename from img/icons/indymediamodern/download.png rename to theme/indymediamodern/icons/download.png diff --git a/img/icons/indymediamodern/edit.png b/theme/indymediamodern/icons/edit.png similarity index 100% rename from img/icons/indymediamodern/edit.png rename to theme/indymediamodern/icons/edit.png diff --git a/img/icons/indymediamodern/edit_notify.png b/theme/indymediamodern/icons/edit_notify.png similarity index 100% rename from img/icons/indymediamodern/edit_notify.png rename to theme/indymediamodern/icons/edit_notify.png diff --git a/img/icons/indymediamodern/like.png b/theme/indymediamodern/icons/like.png similarity index 100% rename from img/icons/indymediamodern/like.png rename to theme/indymediamodern/icons/like.png diff --git a/img/icons/indymediamodern/like_inactive.png b/theme/indymediamodern/icons/like_inactive.png similarity index 100% rename from img/icons/indymediamodern/like_inactive.png rename to theme/indymediamodern/icons/like_inactive.png diff --git a/img/icons/indymediamodern/links.png b/theme/indymediamodern/icons/links.png similarity index 100% rename from img/icons/indymediamodern/links.png rename to theme/indymediamodern/icons/links.png diff --git a/img/icons/indymediamodern/logorss.png b/theme/indymediamodern/icons/logorss.png similarity index 100% rename from img/icons/indymediamodern/logorss.png rename to theme/indymediamodern/icons/logorss.png diff --git a/img/icons/indymediamodern/logout.png b/theme/indymediamodern/icons/logout.png similarity index 100% rename from img/icons/indymediamodern/logout.png rename to theme/indymediamodern/icons/logout.png diff --git a/img/icons/indymediamodern/mute.png b/theme/indymediamodern/icons/mute.png similarity index 100% rename from img/icons/indymediamodern/mute.png rename to theme/indymediamodern/icons/mute.png diff --git a/img/icons/indymediamodern/new.png b/theme/indymediamodern/icons/new.png similarity index 100% rename from img/icons/indymediamodern/new.png rename to theme/indymediamodern/icons/new.png diff --git a/img/icons/indymediamodern/newpost.png b/theme/indymediamodern/icons/newpost.png similarity index 100% rename from img/icons/indymediamodern/newpost.png rename to theme/indymediamodern/icons/newpost.png diff --git a/img/icons/indymediamodern/newswire.png b/theme/indymediamodern/icons/newswire.png similarity index 100% rename from img/icons/indymediamodern/newswire.png rename to theme/indymediamodern/icons/newswire.png diff --git a/img/icons/indymediamodern/pagedown.png b/theme/indymediamodern/icons/pagedown.png similarity index 100% rename from img/icons/indymediamodern/pagedown.png rename to theme/indymediamodern/icons/pagedown.png diff --git a/img/icons/indymediamodern/pageup.png b/theme/indymediamodern/icons/pageup.png similarity index 100% rename from img/icons/indymediamodern/pageup.png rename to theme/indymediamodern/icons/pageup.png diff --git a/img/icons/indymediamodern/person.png b/theme/indymediamodern/icons/person.png similarity index 100% rename from img/icons/indymediamodern/person.png rename to theme/indymediamodern/icons/person.png diff --git a/img/icons/indymediamodern/prev.png b/theme/indymediamodern/icons/prev.png similarity index 100% rename from img/icons/indymediamodern/prev.png rename to theme/indymediamodern/icons/prev.png diff --git a/img/icons/indymediamodern/publish.png b/theme/indymediamodern/icons/publish.png similarity index 100% rename from img/icons/indymediamodern/publish.png rename to theme/indymediamodern/icons/publish.png diff --git a/img/icons/indymediamodern/qrcode.png b/theme/indymediamodern/icons/qrcode.png similarity index 100% rename from img/icons/indymediamodern/qrcode.png rename to theme/indymediamodern/icons/qrcode.png diff --git a/img/icons/indymediamodern/repeat.png b/theme/indymediamodern/icons/repeat.png similarity index 100% rename from img/icons/indymediamodern/repeat.png rename to theme/indymediamodern/icons/repeat.png diff --git a/img/icons/indymediamodern/repeat_inactive.png b/theme/indymediamodern/icons/repeat_inactive.png similarity index 100% rename from img/icons/indymediamodern/repeat_inactive.png rename to theme/indymediamodern/icons/repeat_inactive.png diff --git a/img/icons/indymediamodern/reply.png b/theme/indymediamodern/icons/reply.png similarity index 100% rename from img/icons/indymediamodern/reply.png rename to theme/indymediamodern/icons/reply.png diff --git a/img/icons/indymediamodern/rss3.png b/theme/indymediamodern/icons/rss3.png similarity index 100% rename from img/icons/indymediamodern/rss3.png rename to theme/indymediamodern/icons/rss3.png diff --git a/img/icons/indymediamodern/scope_blog.png b/theme/indymediamodern/icons/scope_blog.png similarity index 100% rename from img/icons/indymediamodern/scope_blog.png rename to theme/indymediamodern/icons/scope_blog.png diff --git a/img/icons/indymediamodern/scope_dm.png b/theme/indymediamodern/icons/scope_dm.png similarity index 100% rename from img/icons/indymediamodern/scope_dm.png rename to theme/indymediamodern/icons/scope_dm.png diff --git a/img/icons/indymediamodern/scope_event.png b/theme/indymediamodern/icons/scope_event.png similarity index 100% rename from img/icons/indymediamodern/scope_event.png rename to theme/indymediamodern/icons/scope_event.png diff --git a/img/icons/indymediamodern/scope_followers.png b/theme/indymediamodern/icons/scope_followers.png similarity index 100% rename from img/icons/indymediamodern/scope_followers.png rename to theme/indymediamodern/icons/scope_followers.png diff --git a/img/icons/indymediamodern/scope_public.png b/theme/indymediamodern/icons/scope_public.png similarity index 100% rename from img/icons/indymediamodern/scope_public.png rename to theme/indymediamodern/icons/scope_public.png diff --git a/img/icons/indymediamodern/scope_question.png b/theme/indymediamodern/icons/scope_question.png similarity index 100% rename from img/icons/indymediamodern/scope_question.png rename to theme/indymediamodern/icons/scope_question.png diff --git a/img/icons/indymediamodern/scope_reminder.png b/theme/indymediamodern/icons/scope_reminder.png similarity index 100% rename from img/icons/indymediamodern/scope_reminder.png rename to theme/indymediamodern/icons/scope_reminder.png diff --git a/img/icons/indymediamodern/scope_report.png b/theme/indymediamodern/icons/scope_report.png similarity index 100% rename from img/icons/indymediamodern/scope_report.png rename to theme/indymediamodern/icons/scope_report.png diff --git a/img/icons/indymediamodern/scope_share.png b/theme/indymediamodern/icons/scope_share.png similarity index 100% rename from img/icons/indymediamodern/scope_share.png rename to theme/indymediamodern/icons/scope_share.png diff --git a/img/icons/indymediamodern/scope_unlisted.png b/theme/indymediamodern/icons/scope_unlisted.png similarity index 100% rename from img/icons/indymediamodern/scope_unlisted.png rename to theme/indymediamodern/icons/scope_unlisted.png diff --git a/img/icons/indymediamodern/search.png b/theme/indymediamodern/icons/search.png similarity index 100% rename from img/icons/indymediamodern/search.png rename to theme/indymediamodern/icons/search.png diff --git a/img/icons/indymediamodern/separator.png b/theme/indymediamodern/icons/separator.png similarity index 100% rename from img/icons/indymediamodern/separator.png rename to theme/indymediamodern/icons/separator.png diff --git a/img/icons/indymediamodern/separator_left.png b/theme/indymediamodern/icons/separator_left.png similarity index 100% rename from img/icons/indymediamodern/separator_left.png rename to theme/indymediamodern/icons/separator_left.png diff --git a/img/icons/indymediamodern/showhide.png b/theme/indymediamodern/icons/showhide.png similarity index 100% rename from img/icons/indymediamodern/showhide.png rename to theme/indymediamodern/icons/showhide.png diff --git a/img/icons/indymediamodern/unmute.png b/theme/indymediamodern/icons/unmute.png similarity index 100% rename from img/icons/indymediamodern/unmute.png rename to theme/indymediamodern/icons/unmute.png diff --git a/img/icons/indymediamodern/vote.png b/theme/indymediamodern/icons/vote.png similarity index 100% rename from img/icons/indymediamodern/vote.png rename to theme/indymediamodern/icons/vote.png diff --git a/img/icons/lcd/add.png b/theme/lcd/icons/add.png similarity index 100% rename from img/icons/lcd/add.png rename to theme/lcd/icons/add.png diff --git a/img/icons/lcd/avatar_news.png b/theme/lcd/icons/avatar_news.png similarity index 100% rename from img/icons/lcd/avatar_news.png rename to theme/lcd/icons/avatar_news.png diff --git a/img/icons/lcd/bookmark.png b/theme/lcd/icons/bookmark.png similarity index 100% rename from img/icons/lcd/bookmark.png rename to theme/lcd/icons/bookmark.png diff --git a/img/icons/lcd/bookmark_inactive.png b/theme/lcd/icons/bookmark_inactive.png similarity index 100% rename from img/icons/lcd/bookmark_inactive.png rename to theme/lcd/icons/bookmark_inactive.png diff --git a/img/icons/lcd/calendar.png b/theme/lcd/icons/calendar.png similarity index 100% rename from img/icons/lcd/calendar.png rename to theme/lcd/icons/calendar.png diff --git a/img/icons/lcd/calendar_notify.png b/theme/lcd/icons/calendar_notify.png similarity index 100% rename from img/icons/lcd/calendar_notify.png rename to theme/lcd/icons/calendar_notify.png diff --git a/img/icons/lcd/delete.png b/theme/lcd/icons/delete.png similarity index 100% rename from img/icons/lcd/delete.png rename to theme/lcd/icons/delete.png diff --git a/img/icons/lcd/dm.png b/theme/lcd/icons/dm.png similarity index 100% rename from img/icons/lcd/dm.png rename to theme/lcd/icons/dm.png diff --git a/img/icons/lcd/download.png b/theme/lcd/icons/download.png similarity index 100% rename from img/icons/lcd/download.png rename to theme/lcd/icons/download.png diff --git a/img/icons/lcd/edit.png b/theme/lcd/icons/edit.png similarity index 100% rename from img/icons/lcd/edit.png rename to theme/lcd/icons/edit.png diff --git a/img/icons/lcd/edit_notify.png b/theme/lcd/icons/edit_notify.png similarity index 100% rename from img/icons/lcd/edit_notify.png rename to theme/lcd/icons/edit_notify.png diff --git a/img/icons/lcd/like.png b/theme/lcd/icons/like.png similarity index 100% rename from img/icons/lcd/like.png rename to theme/lcd/icons/like.png diff --git a/img/icons/lcd/like_inactive.png b/theme/lcd/icons/like_inactive.png similarity index 100% rename from img/icons/lcd/like_inactive.png rename to theme/lcd/icons/like_inactive.png diff --git a/img/icons/lcd/links.png b/theme/lcd/icons/links.png similarity index 100% rename from img/icons/lcd/links.png rename to theme/lcd/icons/links.png diff --git a/img/icons/lcd/logorss.png b/theme/lcd/icons/logorss.png similarity index 100% rename from img/icons/lcd/logorss.png rename to theme/lcd/icons/logorss.png diff --git a/img/icons/lcd/logout.png b/theme/lcd/icons/logout.png similarity index 100% rename from img/icons/lcd/logout.png rename to theme/lcd/icons/logout.png diff --git a/img/icons/lcd/mute.png b/theme/lcd/icons/mute.png similarity index 100% rename from img/icons/lcd/mute.png rename to theme/lcd/icons/mute.png diff --git a/img/icons/lcd/new.png b/theme/lcd/icons/new.png similarity index 100% rename from img/icons/lcd/new.png rename to theme/lcd/icons/new.png diff --git a/img/icons/lcd/newpost.png b/theme/lcd/icons/newpost.png similarity index 100% rename from img/icons/lcd/newpost.png rename to theme/lcd/icons/newpost.png diff --git a/img/icons/lcd/newswire.png b/theme/lcd/icons/newswire.png similarity index 100% rename from img/icons/lcd/newswire.png rename to theme/lcd/icons/newswire.png diff --git a/img/icons/lcd/pagedown.png b/theme/lcd/icons/pagedown.png similarity index 100% rename from img/icons/lcd/pagedown.png rename to theme/lcd/icons/pagedown.png diff --git a/img/icons/lcd/pageup.png b/theme/lcd/icons/pageup.png similarity index 100% rename from img/icons/lcd/pageup.png rename to theme/lcd/icons/pageup.png diff --git a/img/icons/lcd/person.png b/theme/lcd/icons/person.png similarity index 100% rename from img/icons/lcd/person.png rename to theme/lcd/icons/person.png diff --git a/img/icons/lcd/prev.png b/theme/lcd/icons/prev.png similarity index 100% rename from img/icons/lcd/prev.png rename to theme/lcd/icons/prev.png diff --git a/img/icons/lcd/publish.png b/theme/lcd/icons/publish.png similarity index 100% rename from img/icons/lcd/publish.png rename to theme/lcd/icons/publish.png diff --git a/img/icons/lcd/qrcode.png b/theme/lcd/icons/qrcode.png similarity index 100% rename from img/icons/lcd/qrcode.png rename to theme/lcd/icons/qrcode.png diff --git a/img/icons/lcd/repeat.png b/theme/lcd/icons/repeat.png similarity index 100% rename from img/icons/lcd/repeat.png rename to theme/lcd/icons/repeat.png diff --git a/img/icons/lcd/repeat_inactive.png b/theme/lcd/icons/repeat_inactive.png similarity index 100% rename from img/icons/lcd/repeat_inactive.png rename to theme/lcd/icons/repeat_inactive.png diff --git a/img/icons/lcd/reply.png b/theme/lcd/icons/reply.png similarity index 100% rename from img/icons/lcd/reply.png rename to theme/lcd/icons/reply.png diff --git a/img/icons/lcd/rss3.png b/theme/lcd/icons/rss3.png similarity index 100% rename from img/icons/lcd/rss3.png rename to theme/lcd/icons/rss3.png diff --git a/img/icons/lcd/scope_blog.png b/theme/lcd/icons/scope_blog.png similarity index 100% rename from img/icons/lcd/scope_blog.png rename to theme/lcd/icons/scope_blog.png diff --git a/img/icons/lcd/scope_dm.png b/theme/lcd/icons/scope_dm.png similarity index 100% rename from img/icons/lcd/scope_dm.png rename to theme/lcd/icons/scope_dm.png diff --git a/img/icons/lcd/scope_event.png b/theme/lcd/icons/scope_event.png similarity index 100% rename from img/icons/lcd/scope_event.png rename to theme/lcd/icons/scope_event.png diff --git a/img/icons/lcd/scope_followers.png b/theme/lcd/icons/scope_followers.png similarity index 100% rename from img/icons/lcd/scope_followers.png rename to theme/lcd/icons/scope_followers.png diff --git a/img/icons/lcd/scope_public.png b/theme/lcd/icons/scope_public.png similarity index 100% rename from img/icons/lcd/scope_public.png rename to theme/lcd/icons/scope_public.png diff --git a/img/icons/lcd/scope_question.png b/theme/lcd/icons/scope_question.png similarity index 100% rename from img/icons/lcd/scope_question.png rename to theme/lcd/icons/scope_question.png diff --git a/img/icons/lcd/scope_reminder.png b/theme/lcd/icons/scope_reminder.png similarity index 100% rename from img/icons/lcd/scope_reminder.png rename to theme/lcd/icons/scope_reminder.png diff --git a/img/icons/lcd/scope_report.png b/theme/lcd/icons/scope_report.png similarity index 100% rename from img/icons/lcd/scope_report.png rename to theme/lcd/icons/scope_report.png diff --git a/img/icons/lcd/scope_share.png b/theme/lcd/icons/scope_share.png similarity index 100% rename from img/icons/lcd/scope_share.png rename to theme/lcd/icons/scope_share.png diff --git a/img/icons/lcd/scope_unlisted.png b/theme/lcd/icons/scope_unlisted.png similarity index 100% rename from img/icons/lcd/scope_unlisted.png rename to theme/lcd/icons/scope_unlisted.png diff --git a/img/icons/lcd/search.png b/theme/lcd/icons/search.png similarity index 100% rename from img/icons/lcd/search.png rename to theme/lcd/icons/search.png diff --git a/img/icons/lcd/showhide.png b/theme/lcd/icons/showhide.png similarity index 100% rename from img/icons/lcd/showhide.png rename to theme/lcd/icons/showhide.png diff --git a/img/icons/lcd/unmute.png b/theme/lcd/icons/unmute.png similarity index 100% rename from img/icons/lcd/unmute.png rename to theme/lcd/icons/unmute.png diff --git a/img/icons/lcd/vote.png b/theme/lcd/icons/vote.png similarity index 100% rename from img/icons/lcd/vote.png rename to theme/lcd/icons/vote.png diff --git a/img/icons/light/add.png b/theme/light/icons/add.png similarity index 100% rename from img/icons/light/add.png rename to theme/light/icons/add.png diff --git a/img/icons/light/avatar_news.png b/theme/light/icons/avatar_news.png similarity index 100% rename from img/icons/light/avatar_news.png rename to theme/light/icons/avatar_news.png diff --git a/img/icons/light/bookmark.png b/theme/light/icons/bookmark.png similarity index 100% rename from img/icons/light/bookmark.png rename to theme/light/icons/bookmark.png diff --git a/img/icons/bookmark_inactive.png b/theme/light/icons/bookmark_inactive.png similarity index 100% rename from img/icons/bookmark_inactive.png rename to theme/light/icons/bookmark_inactive.png diff --git a/img/icons/light/calendar.png b/theme/light/icons/calendar.png similarity index 100% rename from img/icons/light/calendar.png rename to theme/light/icons/calendar.png diff --git a/img/icons/light/calendar_notify.png b/theme/light/icons/calendar_notify.png similarity index 100% rename from img/icons/light/calendar_notify.png rename to theme/light/icons/calendar_notify.png diff --git a/img/icons/light/delete.png b/theme/light/icons/delete.png similarity index 100% rename from img/icons/light/delete.png rename to theme/light/icons/delete.png diff --git a/img/icons/light/dm.png b/theme/light/icons/dm.png similarity index 100% rename from img/icons/light/dm.png rename to theme/light/icons/dm.png diff --git a/img/icons/download.png b/theme/light/icons/download.png similarity index 100% rename from img/icons/download.png rename to theme/light/icons/download.png diff --git a/img/icons/light/edit.png b/theme/light/icons/edit.png similarity index 100% rename from img/icons/light/edit.png rename to theme/light/icons/edit.png diff --git a/img/icons/light/edit_notify.png b/theme/light/icons/edit_notify.png similarity index 100% rename from img/icons/light/edit_notify.png rename to theme/light/icons/edit_notify.png diff --git a/img/icons/light/like.png b/theme/light/icons/like.png similarity index 100% rename from img/icons/light/like.png rename to theme/light/icons/like.png diff --git a/img/icons/light/like_inactive.png b/theme/light/icons/like_inactive.png similarity index 100% rename from img/icons/light/like_inactive.png rename to theme/light/icons/like_inactive.png diff --git a/img/icons/light/links.png b/theme/light/icons/links.png similarity index 100% rename from img/icons/light/links.png rename to theme/light/icons/links.png diff --git a/img/icons/light/logorss.png b/theme/light/icons/logorss.png similarity index 100% rename from img/icons/light/logorss.png rename to theme/light/icons/logorss.png diff --git a/img/icons/light/logout.png b/theme/light/icons/logout.png similarity index 100% rename from img/icons/light/logout.png rename to theme/light/icons/logout.png diff --git a/img/icons/light/mute.png b/theme/light/icons/mute.png similarity index 100% rename from img/icons/light/mute.png rename to theme/light/icons/mute.png diff --git a/img/icons/light/new.png b/theme/light/icons/new.png similarity index 100% rename from img/icons/light/new.png rename to theme/light/icons/new.png diff --git a/img/icons/light/newpost.png b/theme/light/icons/newpost.png similarity index 100% rename from img/icons/light/newpost.png rename to theme/light/icons/newpost.png diff --git a/img/icons/light/newswire.png b/theme/light/icons/newswire.png similarity index 100% rename from img/icons/light/newswire.png rename to theme/light/icons/newswire.png diff --git a/img/icons/light/pagedown.png b/theme/light/icons/pagedown.png similarity index 100% rename from img/icons/light/pagedown.png rename to theme/light/icons/pagedown.png diff --git a/img/icons/light/pageup.png b/theme/light/icons/pageup.png similarity index 100% rename from img/icons/light/pageup.png rename to theme/light/icons/pageup.png diff --git a/img/icons/light/person.png b/theme/light/icons/person.png similarity index 100% rename from img/icons/light/person.png rename to theme/light/icons/person.png diff --git a/img/icons/light/prev.png b/theme/light/icons/prev.png similarity index 100% rename from img/icons/light/prev.png rename to theme/light/icons/prev.png diff --git a/img/icons/light/publish.png b/theme/light/icons/publish.png similarity index 100% rename from img/icons/light/publish.png rename to theme/light/icons/publish.png diff --git a/img/icons/light/qrcode.png b/theme/light/icons/qrcode.png similarity index 100% rename from img/icons/light/qrcode.png rename to theme/light/icons/qrcode.png diff --git a/img/icons/light/repeat.png b/theme/light/icons/repeat.png similarity index 100% rename from img/icons/light/repeat.png rename to theme/light/icons/repeat.png diff --git a/img/icons/light/repeat_inactive.png b/theme/light/icons/repeat_inactive.png similarity index 100% rename from img/icons/light/repeat_inactive.png rename to theme/light/icons/repeat_inactive.png diff --git a/img/icons/light/reply.png b/theme/light/icons/reply.png similarity index 100% rename from img/icons/light/reply.png rename to theme/light/icons/reply.png diff --git a/img/icons/light/rss3.png b/theme/light/icons/rss3.png similarity index 100% rename from img/icons/light/rss3.png rename to theme/light/icons/rss3.png diff --git a/img/icons/light/scope_blog.png b/theme/light/icons/scope_blog.png similarity index 100% rename from img/icons/light/scope_blog.png rename to theme/light/icons/scope_blog.png diff --git a/img/icons/light/scope_dm.png b/theme/light/icons/scope_dm.png similarity index 100% rename from img/icons/light/scope_dm.png rename to theme/light/icons/scope_dm.png diff --git a/img/icons/light/scope_event.png b/theme/light/icons/scope_event.png similarity index 100% rename from img/icons/light/scope_event.png rename to theme/light/icons/scope_event.png diff --git a/img/icons/light/scope_followers.png b/theme/light/icons/scope_followers.png similarity index 100% rename from img/icons/light/scope_followers.png rename to theme/light/icons/scope_followers.png diff --git a/img/icons/light/scope_public.png b/theme/light/icons/scope_public.png similarity index 100% rename from img/icons/light/scope_public.png rename to theme/light/icons/scope_public.png diff --git a/img/icons/light/scope_question.png b/theme/light/icons/scope_question.png similarity index 100% rename from img/icons/light/scope_question.png rename to theme/light/icons/scope_question.png diff --git a/img/icons/light/scope_reminder.png b/theme/light/icons/scope_reminder.png similarity index 100% rename from img/icons/light/scope_reminder.png rename to theme/light/icons/scope_reminder.png diff --git a/img/icons/light/scope_report.png b/theme/light/icons/scope_report.png similarity index 100% rename from img/icons/light/scope_report.png rename to theme/light/icons/scope_report.png diff --git a/img/icons/light/scope_share.png b/theme/light/icons/scope_share.png similarity index 100% rename from img/icons/light/scope_share.png rename to theme/light/icons/scope_share.png diff --git a/img/icons/light/scope_unlisted.png b/theme/light/icons/scope_unlisted.png similarity index 100% rename from img/icons/light/scope_unlisted.png rename to theme/light/icons/scope_unlisted.png diff --git a/img/icons/light/search.png b/theme/light/icons/search.png similarity index 100% rename from img/icons/light/search.png rename to theme/light/icons/search.png diff --git a/img/icons/light/showhide.png b/theme/light/icons/showhide.png similarity index 100% rename from img/icons/light/showhide.png rename to theme/light/icons/showhide.png diff --git a/img/icons/light/unmute.png b/theme/light/icons/unmute.png similarity index 100% rename from img/icons/light/unmute.png rename to theme/light/icons/unmute.png diff --git a/img/icons/light/vote.png b/theme/light/icons/vote.png similarity index 100% rename from img/icons/light/vote.png rename to theme/light/icons/vote.png diff --git a/img/icons/night/add.png b/theme/night/icons/add.png similarity index 100% rename from img/icons/night/add.png rename to theme/night/icons/add.png diff --git a/img/icons/night/avatar_news.png b/theme/night/icons/avatar_news.png similarity index 100% rename from img/icons/night/avatar_news.png rename to theme/night/icons/avatar_news.png diff --git a/img/icons/night/bookmark.png b/theme/night/icons/bookmark.png similarity index 100% rename from img/icons/night/bookmark.png rename to theme/night/icons/bookmark.png diff --git a/img/icons/light/bookmark_inactive.png b/theme/night/icons/bookmark_inactive.png similarity index 100% rename from img/icons/light/bookmark_inactive.png rename to theme/night/icons/bookmark_inactive.png diff --git a/img/icons/night/calendar.png b/theme/night/icons/calendar.png similarity index 100% rename from img/icons/night/calendar.png rename to theme/night/icons/calendar.png diff --git a/img/icons/night/calendar_notify.png b/theme/night/icons/calendar_notify.png similarity index 100% rename from img/icons/night/calendar_notify.png rename to theme/night/icons/calendar_notify.png diff --git a/img/icons/night/delete.png b/theme/night/icons/delete.png similarity index 100% rename from img/icons/night/delete.png rename to theme/night/icons/delete.png diff --git a/img/icons/night/dm.png b/theme/night/icons/dm.png similarity index 100% rename from img/icons/night/dm.png rename to theme/night/icons/dm.png diff --git a/img/icons/light/download.png b/theme/night/icons/download.png similarity index 100% rename from img/icons/light/download.png rename to theme/night/icons/download.png diff --git a/img/icons/night/edit.png b/theme/night/icons/edit.png similarity index 100% rename from img/icons/night/edit.png rename to theme/night/icons/edit.png diff --git a/img/icons/night/edit_notify.png b/theme/night/icons/edit_notify.png similarity index 100% rename from img/icons/night/edit_notify.png rename to theme/night/icons/edit_notify.png diff --git a/img/icons/night/like.png b/theme/night/icons/like.png similarity index 100% rename from img/icons/night/like.png rename to theme/night/icons/like.png diff --git a/img/icons/night/like_inactive.png b/theme/night/icons/like_inactive.png similarity index 100% rename from img/icons/night/like_inactive.png rename to theme/night/icons/like_inactive.png diff --git a/img/icons/links.png b/theme/night/icons/links.png similarity index 100% rename from img/icons/links.png rename to theme/night/icons/links.png diff --git a/img/icons/night/logorss.png b/theme/night/icons/logorss.png similarity index 100% rename from img/icons/night/logorss.png rename to theme/night/icons/logorss.png diff --git a/img/icons/logout.png b/theme/night/icons/logout.png similarity index 100% rename from img/icons/logout.png rename to theme/night/icons/logout.png diff --git a/img/icons/night/mute.png b/theme/night/icons/mute.png similarity index 100% rename from img/icons/night/mute.png rename to theme/night/icons/mute.png diff --git a/img/icons/night/new.png b/theme/night/icons/new.png similarity index 100% rename from img/icons/night/new.png rename to theme/night/icons/new.png diff --git a/img/icons/night/newpost.png b/theme/night/icons/newpost.png similarity index 100% rename from img/icons/night/newpost.png rename to theme/night/icons/newpost.png diff --git a/img/icons/night/newswire.png b/theme/night/icons/newswire.png similarity index 100% rename from img/icons/night/newswire.png rename to theme/night/icons/newswire.png diff --git a/img/icons/night/pagedown.png b/theme/night/icons/pagedown.png similarity index 100% rename from img/icons/night/pagedown.png rename to theme/night/icons/pagedown.png diff --git a/img/icons/night/pageup.png b/theme/night/icons/pageup.png similarity index 100% rename from img/icons/night/pageup.png rename to theme/night/icons/pageup.png diff --git a/img/icons/night/person.png b/theme/night/icons/person.png similarity index 100% rename from img/icons/night/person.png rename to theme/night/icons/person.png diff --git a/img/icons/night/prev.png b/theme/night/icons/prev.png similarity index 100% rename from img/icons/night/prev.png rename to theme/night/icons/prev.png diff --git a/img/icons/night/publish.png b/theme/night/icons/publish.png similarity index 100% rename from img/icons/night/publish.png rename to theme/night/icons/publish.png diff --git a/img/icons/night/qrcode.png b/theme/night/icons/qrcode.png similarity index 100% rename from img/icons/night/qrcode.png rename to theme/night/icons/qrcode.png diff --git a/img/icons/night/repeat.png b/theme/night/icons/repeat.png similarity index 100% rename from img/icons/night/repeat.png rename to theme/night/icons/repeat.png diff --git a/img/icons/night/repeat_inactive.png b/theme/night/icons/repeat_inactive.png similarity index 100% rename from img/icons/night/repeat_inactive.png rename to theme/night/icons/repeat_inactive.png diff --git a/img/icons/night/reply.png b/theme/night/icons/reply.png similarity index 100% rename from img/icons/night/reply.png rename to theme/night/icons/reply.png diff --git a/img/icons/night/rss3.png b/theme/night/icons/rss3.png similarity index 100% rename from img/icons/night/rss3.png rename to theme/night/icons/rss3.png diff --git a/img/icons/night/scope_blog.png b/theme/night/icons/scope_blog.png similarity index 100% rename from img/icons/night/scope_blog.png rename to theme/night/icons/scope_blog.png diff --git a/img/icons/night/scope_dm.png b/theme/night/icons/scope_dm.png similarity index 100% rename from img/icons/night/scope_dm.png rename to theme/night/icons/scope_dm.png diff --git a/img/icons/night/scope_event.png b/theme/night/icons/scope_event.png similarity index 100% rename from img/icons/night/scope_event.png rename to theme/night/icons/scope_event.png diff --git a/img/icons/night/scope_followers.png b/theme/night/icons/scope_followers.png similarity index 100% rename from img/icons/night/scope_followers.png rename to theme/night/icons/scope_followers.png diff --git a/img/icons/night/scope_public.png b/theme/night/icons/scope_public.png similarity index 100% rename from img/icons/night/scope_public.png rename to theme/night/icons/scope_public.png diff --git a/img/icons/night/scope_question.png b/theme/night/icons/scope_question.png similarity index 100% rename from img/icons/night/scope_question.png rename to theme/night/icons/scope_question.png diff --git a/img/icons/night/scope_reminder.png b/theme/night/icons/scope_reminder.png similarity index 100% rename from img/icons/night/scope_reminder.png rename to theme/night/icons/scope_reminder.png diff --git a/img/icons/night/scope_report.png b/theme/night/icons/scope_report.png similarity index 100% rename from img/icons/night/scope_report.png rename to theme/night/icons/scope_report.png diff --git a/img/icons/night/scope_share.png b/theme/night/icons/scope_share.png similarity index 100% rename from img/icons/night/scope_share.png rename to theme/night/icons/scope_share.png diff --git a/img/icons/night/scope_unlisted.png b/theme/night/icons/scope_unlisted.png similarity index 100% rename from img/icons/night/scope_unlisted.png rename to theme/night/icons/scope_unlisted.png diff --git a/img/icons/night/search.png b/theme/night/icons/search.png similarity index 100% rename from img/icons/night/search.png rename to theme/night/icons/search.png diff --git a/img/icons/night/separator_right.png b/theme/night/icons/separator_right.png similarity index 100% rename from img/icons/night/separator_right.png rename to theme/night/icons/separator_right.png diff --git a/img/icons/night/showhide.png b/theme/night/icons/showhide.png similarity index 100% rename from img/icons/night/showhide.png rename to theme/night/icons/showhide.png diff --git a/img/icons/night/unmute.png b/theme/night/icons/unmute.png similarity index 100% rename from img/icons/night/unmute.png rename to theme/night/icons/unmute.png diff --git a/img/icons/night/vote.png b/theme/night/icons/vote.png similarity index 100% rename from img/icons/night/vote.png rename to theme/night/icons/vote.png diff --git a/img/icons/purple/add.png b/theme/purple/icons/add.png similarity index 100% rename from img/icons/purple/add.png rename to theme/purple/icons/add.png diff --git a/img/icons/purple/avatar_news.png b/theme/purple/icons/avatar_news.png similarity index 100% rename from img/icons/purple/avatar_news.png rename to theme/purple/icons/avatar_news.png diff --git a/img/icons/purple/bookmark.png b/theme/purple/icons/bookmark.png similarity index 100% rename from img/icons/purple/bookmark.png rename to theme/purple/icons/bookmark.png diff --git a/img/icons/purple/bookmark_inactive.png b/theme/purple/icons/bookmark_inactive.png similarity index 100% rename from img/icons/purple/bookmark_inactive.png rename to theme/purple/icons/bookmark_inactive.png diff --git a/img/icons/purple/calendar.png b/theme/purple/icons/calendar.png similarity index 100% rename from img/icons/purple/calendar.png rename to theme/purple/icons/calendar.png diff --git a/img/icons/purple/calendar_notify.png b/theme/purple/icons/calendar_notify.png similarity index 100% rename from img/icons/purple/calendar_notify.png rename to theme/purple/icons/calendar_notify.png diff --git a/img/icons/purple/delete.png b/theme/purple/icons/delete.png similarity index 100% rename from img/icons/purple/delete.png rename to theme/purple/icons/delete.png diff --git a/img/icons/purple/dm.png b/theme/purple/icons/dm.png similarity index 100% rename from img/icons/purple/dm.png rename to theme/purple/icons/dm.png diff --git a/img/icons/purple/download.png b/theme/purple/icons/download.png similarity index 100% rename from img/icons/purple/download.png rename to theme/purple/icons/download.png diff --git a/img/icons/purple/edit.png b/theme/purple/icons/edit.png similarity index 100% rename from img/icons/purple/edit.png rename to theme/purple/icons/edit.png diff --git a/img/icons/purple/edit_notify.png b/theme/purple/icons/edit_notify.png similarity index 100% rename from img/icons/purple/edit_notify.png rename to theme/purple/icons/edit_notify.png diff --git a/img/icons/purple/like.png b/theme/purple/icons/like.png similarity index 100% rename from img/icons/purple/like.png rename to theme/purple/icons/like.png diff --git a/img/icons/purple/like_inactive.png b/theme/purple/icons/like_inactive.png similarity index 100% rename from img/icons/purple/like_inactive.png rename to theme/purple/icons/like_inactive.png diff --git a/img/icons/purple/links.png b/theme/purple/icons/links.png similarity index 100% rename from img/icons/purple/links.png rename to theme/purple/icons/links.png diff --git a/img/icons/purple/logorss.png b/theme/purple/icons/logorss.png similarity index 100% rename from img/icons/purple/logorss.png rename to theme/purple/icons/logorss.png diff --git a/img/icons/purple/logout.png b/theme/purple/icons/logout.png similarity index 100% rename from img/icons/purple/logout.png rename to theme/purple/icons/logout.png diff --git a/img/icons/purple/mute.png b/theme/purple/icons/mute.png similarity index 100% rename from img/icons/purple/mute.png rename to theme/purple/icons/mute.png diff --git a/img/icons/purple/new.png b/theme/purple/icons/new.png similarity index 100% rename from img/icons/purple/new.png rename to theme/purple/icons/new.png diff --git a/img/icons/purple/newpost.png b/theme/purple/icons/newpost.png similarity index 100% rename from img/icons/purple/newpost.png rename to theme/purple/icons/newpost.png diff --git a/img/icons/purple/newswire.png b/theme/purple/icons/newswire.png similarity index 100% rename from img/icons/purple/newswire.png rename to theme/purple/icons/newswire.png diff --git a/img/icons/purple/pagedown.png b/theme/purple/icons/pagedown.png similarity index 100% rename from img/icons/purple/pagedown.png rename to theme/purple/icons/pagedown.png diff --git a/img/icons/purple/pageup.png b/theme/purple/icons/pageup.png similarity index 100% rename from img/icons/purple/pageup.png rename to theme/purple/icons/pageup.png diff --git a/img/icons/purple/person.png b/theme/purple/icons/person.png similarity index 100% rename from img/icons/purple/person.png rename to theme/purple/icons/person.png diff --git a/img/icons/purple/prev.png b/theme/purple/icons/prev.png similarity index 100% rename from img/icons/purple/prev.png rename to theme/purple/icons/prev.png diff --git a/img/icons/purple/publish.png b/theme/purple/icons/publish.png similarity index 100% rename from img/icons/purple/publish.png rename to theme/purple/icons/publish.png diff --git a/img/icons/purple/qrcode.png b/theme/purple/icons/qrcode.png similarity index 100% rename from img/icons/purple/qrcode.png rename to theme/purple/icons/qrcode.png diff --git a/img/icons/purple/repeat.png b/theme/purple/icons/repeat.png similarity index 100% rename from img/icons/purple/repeat.png rename to theme/purple/icons/repeat.png diff --git a/img/icons/purple/repeat_inactive.png b/theme/purple/icons/repeat_inactive.png similarity index 100% rename from img/icons/purple/repeat_inactive.png rename to theme/purple/icons/repeat_inactive.png diff --git a/img/icons/purple/reply.png b/theme/purple/icons/reply.png similarity index 100% rename from img/icons/purple/reply.png rename to theme/purple/icons/reply.png diff --git a/img/icons/purple/rss3.png b/theme/purple/icons/rss3.png similarity index 100% rename from img/icons/purple/rss3.png rename to theme/purple/icons/rss3.png diff --git a/img/icons/purple/scope_blog.png b/theme/purple/icons/scope_blog.png similarity index 100% rename from img/icons/purple/scope_blog.png rename to theme/purple/icons/scope_blog.png diff --git a/img/icons/purple/scope_dm.png b/theme/purple/icons/scope_dm.png similarity index 100% rename from img/icons/purple/scope_dm.png rename to theme/purple/icons/scope_dm.png diff --git a/img/icons/purple/scope_event.png b/theme/purple/icons/scope_event.png similarity index 100% rename from img/icons/purple/scope_event.png rename to theme/purple/icons/scope_event.png diff --git a/img/icons/purple/scope_followers.png b/theme/purple/icons/scope_followers.png similarity index 100% rename from img/icons/purple/scope_followers.png rename to theme/purple/icons/scope_followers.png diff --git a/img/icons/purple/scope_public.png b/theme/purple/icons/scope_public.png similarity index 100% rename from img/icons/purple/scope_public.png rename to theme/purple/icons/scope_public.png diff --git a/img/icons/purple/scope_question.png b/theme/purple/icons/scope_question.png similarity index 100% rename from img/icons/purple/scope_question.png rename to theme/purple/icons/scope_question.png diff --git a/img/icons/purple/scope_reminder.png b/theme/purple/icons/scope_reminder.png similarity index 100% rename from img/icons/purple/scope_reminder.png rename to theme/purple/icons/scope_reminder.png diff --git a/img/icons/purple/scope_report.png b/theme/purple/icons/scope_report.png similarity index 100% rename from img/icons/purple/scope_report.png rename to theme/purple/icons/scope_report.png diff --git a/img/icons/purple/scope_share.png b/theme/purple/icons/scope_share.png similarity index 100% rename from img/icons/purple/scope_share.png rename to theme/purple/icons/scope_share.png diff --git a/img/icons/purple/scope_unlisted.png b/theme/purple/icons/scope_unlisted.png similarity index 100% rename from img/icons/purple/scope_unlisted.png rename to theme/purple/icons/scope_unlisted.png diff --git a/img/icons/purple/search.png b/theme/purple/icons/search.png similarity index 100% rename from img/icons/purple/search.png rename to theme/purple/icons/search.png diff --git a/img/icons/purple/showhide.png b/theme/purple/icons/showhide.png similarity index 100% rename from img/icons/purple/showhide.png rename to theme/purple/icons/showhide.png diff --git a/img/icons/purple/unmute.png b/theme/purple/icons/unmute.png similarity index 100% rename from img/icons/purple/unmute.png rename to theme/purple/icons/unmute.png diff --git a/img/icons/purple/vote.png b/theme/purple/icons/vote.png similarity index 100% rename from img/icons/purple/vote.png rename to theme/purple/icons/vote.png diff --git a/img/icons/solidaric/add.png b/theme/solidaric/icons/add.png similarity index 100% rename from img/icons/solidaric/add.png rename to theme/solidaric/icons/add.png diff --git a/img/icons/solidaric/avatar_news.png b/theme/solidaric/icons/avatar_news.png similarity index 100% rename from img/icons/solidaric/avatar_news.png rename to theme/solidaric/icons/avatar_news.png diff --git a/img/icons/solidaric/bookmark.png b/theme/solidaric/icons/bookmark.png similarity index 100% rename from img/icons/solidaric/bookmark.png rename to theme/solidaric/icons/bookmark.png diff --git a/img/icons/solidaric/bookmark_inactive.png b/theme/solidaric/icons/bookmark_inactive.png similarity index 100% rename from img/icons/solidaric/bookmark_inactive.png rename to theme/solidaric/icons/bookmark_inactive.png diff --git a/img/icons/solidaric/calendar.png b/theme/solidaric/icons/calendar.png similarity index 100% rename from img/icons/solidaric/calendar.png rename to theme/solidaric/icons/calendar.png diff --git a/img/icons/solidaric/calendar_notify.png b/theme/solidaric/icons/calendar_notify.png similarity index 100% rename from img/icons/solidaric/calendar_notify.png rename to theme/solidaric/icons/calendar_notify.png diff --git a/img/icons/solidaric/delete.png b/theme/solidaric/icons/delete.png similarity index 100% rename from img/icons/solidaric/delete.png rename to theme/solidaric/icons/delete.png diff --git a/img/icons/solidaric/dm.png b/theme/solidaric/icons/dm.png similarity index 100% rename from img/icons/solidaric/dm.png rename to theme/solidaric/icons/dm.png diff --git a/img/icons/solidaric/download.png b/theme/solidaric/icons/download.png similarity index 100% rename from img/icons/solidaric/download.png rename to theme/solidaric/icons/download.png diff --git a/img/icons/solidaric/edit.png b/theme/solidaric/icons/edit.png similarity index 100% rename from img/icons/solidaric/edit.png rename to theme/solidaric/icons/edit.png diff --git a/img/icons/solidaric/edit_notify.png b/theme/solidaric/icons/edit_notify.png similarity index 100% rename from img/icons/solidaric/edit_notify.png rename to theme/solidaric/icons/edit_notify.png diff --git a/img/icons/solidaric/like.png b/theme/solidaric/icons/like.png similarity index 100% rename from img/icons/solidaric/like.png rename to theme/solidaric/icons/like.png diff --git a/img/icons/solidaric/like_inactive.png b/theme/solidaric/icons/like_inactive.png similarity index 100% rename from img/icons/solidaric/like_inactive.png rename to theme/solidaric/icons/like_inactive.png diff --git a/img/icons/solidaric/links.png b/theme/solidaric/icons/links.png similarity index 100% rename from img/icons/solidaric/links.png rename to theme/solidaric/icons/links.png diff --git a/img/icons/solidaric/logorss.png b/theme/solidaric/icons/logorss.png similarity index 100% rename from img/icons/solidaric/logorss.png rename to theme/solidaric/icons/logorss.png diff --git a/img/icons/solidaric/logout.png b/theme/solidaric/icons/logout.png similarity index 100% rename from img/icons/solidaric/logout.png rename to theme/solidaric/icons/logout.png diff --git a/img/icons/solidaric/mute.png b/theme/solidaric/icons/mute.png similarity index 100% rename from img/icons/solidaric/mute.png rename to theme/solidaric/icons/mute.png diff --git a/img/icons/solidaric/new.png b/theme/solidaric/icons/new.png similarity index 100% rename from img/icons/solidaric/new.png rename to theme/solidaric/icons/new.png diff --git a/img/icons/solidaric/newpost.png b/theme/solidaric/icons/newpost.png similarity index 100% rename from img/icons/solidaric/newpost.png rename to theme/solidaric/icons/newpost.png diff --git a/img/icons/solidaric/newswire.png b/theme/solidaric/icons/newswire.png similarity index 100% rename from img/icons/solidaric/newswire.png rename to theme/solidaric/icons/newswire.png diff --git a/img/icons/solidaric/pagedown.png b/theme/solidaric/icons/pagedown.png similarity index 100% rename from img/icons/solidaric/pagedown.png rename to theme/solidaric/icons/pagedown.png diff --git a/img/icons/solidaric/pageup.png b/theme/solidaric/icons/pageup.png similarity index 100% rename from img/icons/solidaric/pageup.png rename to theme/solidaric/icons/pageup.png diff --git a/img/icons/solidaric/person.png b/theme/solidaric/icons/person.png similarity index 100% rename from img/icons/solidaric/person.png rename to theme/solidaric/icons/person.png diff --git a/img/icons/solidaric/prev.png b/theme/solidaric/icons/prev.png similarity index 100% rename from img/icons/solidaric/prev.png rename to theme/solidaric/icons/prev.png diff --git a/img/icons/solidaric/publish.png b/theme/solidaric/icons/publish.png similarity index 100% rename from img/icons/solidaric/publish.png rename to theme/solidaric/icons/publish.png diff --git a/img/icons/qrcode.png b/theme/solidaric/icons/qrcode.png similarity index 100% rename from img/icons/qrcode.png rename to theme/solidaric/icons/qrcode.png diff --git a/img/icons/solidaric/repeat.png b/theme/solidaric/icons/repeat.png similarity index 100% rename from img/icons/solidaric/repeat.png rename to theme/solidaric/icons/repeat.png diff --git a/img/icons/solidaric/repeat_inactive.png b/theme/solidaric/icons/repeat_inactive.png similarity index 100% rename from img/icons/solidaric/repeat_inactive.png rename to theme/solidaric/icons/repeat_inactive.png diff --git a/img/icons/solidaric/reply.png b/theme/solidaric/icons/reply.png similarity index 100% rename from img/icons/solidaric/reply.png rename to theme/solidaric/icons/reply.png diff --git a/img/icons/rss3.png b/theme/solidaric/icons/rss3.png similarity index 100% rename from img/icons/rss3.png rename to theme/solidaric/icons/rss3.png diff --git a/img/icons/solidaric/scope_blog.png b/theme/solidaric/icons/scope_blog.png similarity index 100% rename from img/icons/solidaric/scope_blog.png rename to theme/solidaric/icons/scope_blog.png diff --git a/img/icons/solidaric/scope_dm.png b/theme/solidaric/icons/scope_dm.png similarity index 100% rename from img/icons/solidaric/scope_dm.png rename to theme/solidaric/icons/scope_dm.png diff --git a/img/icons/solidaric/scope_event.png b/theme/solidaric/icons/scope_event.png similarity index 100% rename from img/icons/solidaric/scope_event.png rename to theme/solidaric/icons/scope_event.png diff --git a/img/icons/solidaric/scope_followers.png b/theme/solidaric/icons/scope_followers.png similarity index 100% rename from img/icons/solidaric/scope_followers.png rename to theme/solidaric/icons/scope_followers.png diff --git a/img/icons/solidaric/scope_public.png b/theme/solidaric/icons/scope_public.png similarity index 100% rename from img/icons/solidaric/scope_public.png rename to theme/solidaric/icons/scope_public.png diff --git a/img/icons/solidaric/scope_question.png b/theme/solidaric/icons/scope_question.png similarity index 100% rename from img/icons/solidaric/scope_question.png rename to theme/solidaric/icons/scope_question.png diff --git a/img/icons/solidaric/scope_reminder.png b/theme/solidaric/icons/scope_reminder.png similarity index 100% rename from img/icons/solidaric/scope_reminder.png rename to theme/solidaric/icons/scope_reminder.png diff --git a/img/icons/solidaric/scope_report.png b/theme/solidaric/icons/scope_report.png similarity index 100% rename from img/icons/solidaric/scope_report.png rename to theme/solidaric/icons/scope_report.png diff --git a/img/icons/solidaric/scope_share.png b/theme/solidaric/icons/scope_share.png similarity index 100% rename from img/icons/solidaric/scope_share.png rename to theme/solidaric/icons/scope_share.png diff --git a/img/icons/solidaric/scope_unlisted.png b/theme/solidaric/icons/scope_unlisted.png similarity index 100% rename from img/icons/solidaric/scope_unlisted.png rename to theme/solidaric/icons/scope_unlisted.png diff --git a/img/icons/solidaric/search.png b/theme/solidaric/icons/search.png similarity index 100% rename from img/icons/solidaric/search.png rename to theme/solidaric/icons/search.png diff --git a/img/icons/solidaric/separator.png b/theme/solidaric/icons/separator.png similarity index 100% rename from img/icons/solidaric/separator.png rename to theme/solidaric/icons/separator.png diff --git a/img/icons/solidaric/showhide.png b/theme/solidaric/icons/showhide.png similarity index 100% rename from img/icons/solidaric/showhide.png rename to theme/solidaric/icons/showhide.png diff --git a/img/icons/solidaric/unmute.png b/theme/solidaric/icons/unmute.png similarity index 100% rename from img/icons/solidaric/unmute.png rename to theme/solidaric/icons/unmute.png diff --git a/img/icons/solidaric/vote.png b/theme/solidaric/icons/vote.png similarity index 100% rename from img/icons/solidaric/vote.png rename to theme/solidaric/icons/vote.png diff --git a/img/icons/starlight/add.png b/theme/starlight/icons/add.png similarity index 100% rename from img/icons/starlight/add.png rename to theme/starlight/icons/add.png diff --git a/img/icons/starlight/avatar_news.png b/theme/starlight/icons/avatar_news.png similarity index 100% rename from img/icons/starlight/avatar_news.png rename to theme/starlight/icons/avatar_news.png diff --git a/img/icons/starlight/bookmark.png b/theme/starlight/icons/bookmark.png similarity index 100% rename from img/icons/starlight/bookmark.png rename to theme/starlight/icons/bookmark.png diff --git a/img/icons/starlight/bookmark_inactive.png b/theme/starlight/icons/bookmark_inactive.png similarity index 100% rename from img/icons/starlight/bookmark_inactive.png rename to theme/starlight/icons/bookmark_inactive.png diff --git a/img/icons/starlight/calendar.png b/theme/starlight/icons/calendar.png similarity index 100% rename from img/icons/starlight/calendar.png rename to theme/starlight/icons/calendar.png diff --git a/img/icons/starlight/calendar_notify.png b/theme/starlight/icons/calendar_notify.png similarity index 100% rename from img/icons/starlight/calendar_notify.png rename to theme/starlight/icons/calendar_notify.png diff --git a/img/icons/starlight/delete.png b/theme/starlight/icons/delete.png similarity index 100% rename from img/icons/starlight/delete.png rename to theme/starlight/icons/delete.png diff --git a/img/icons/starlight/dm.png b/theme/starlight/icons/dm.png similarity index 100% rename from img/icons/starlight/dm.png rename to theme/starlight/icons/dm.png diff --git a/img/icons/starlight/download.png b/theme/starlight/icons/download.png similarity index 100% rename from img/icons/starlight/download.png rename to theme/starlight/icons/download.png diff --git a/img/icons/starlight/edit.png b/theme/starlight/icons/edit.png similarity index 100% rename from img/icons/starlight/edit.png rename to theme/starlight/icons/edit.png diff --git a/img/icons/starlight/edit_notify.png b/theme/starlight/icons/edit_notify.png similarity index 100% rename from img/icons/starlight/edit_notify.png rename to theme/starlight/icons/edit_notify.png diff --git a/img/icons/starlight/like.png b/theme/starlight/icons/like.png similarity index 100% rename from img/icons/starlight/like.png rename to theme/starlight/icons/like.png diff --git a/img/icons/starlight/like_inactive.png b/theme/starlight/icons/like_inactive.png similarity index 100% rename from img/icons/starlight/like_inactive.png rename to theme/starlight/icons/like_inactive.png diff --git a/img/icons/starlight/links.png b/theme/starlight/icons/links.png similarity index 100% rename from img/icons/starlight/links.png rename to theme/starlight/icons/links.png diff --git a/img/icons/starlight/logorss.png b/theme/starlight/icons/logorss.png similarity index 100% rename from img/icons/starlight/logorss.png rename to theme/starlight/icons/logorss.png diff --git a/img/icons/starlight/logout.png b/theme/starlight/icons/logout.png similarity index 100% rename from img/icons/starlight/logout.png rename to theme/starlight/icons/logout.png diff --git a/img/icons/starlight/mute.png b/theme/starlight/icons/mute.png similarity index 100% rename from img/icons/starlight/mute.png rename to theme/starlight/icons/mute.png diff --git a/img/icons/starlight/new.png b/theme/starlight/icons/new.png similarity index 100% rename from img/icons/starlight/new.png rename to theme/starlight/icons/new.png diff --git a/img/icons/starlight/newpost.png b/theme/starlight/icons/newpost.png similarity index 100% rename from img/icons/starlight/newpost.png rename to theme/starlight/icons/newpost.png diff --git a/img/icons/starlight/newswire.png b/theme/starlight/icons/newswire.png similarity index 100% rename from img/icons/starlight/newswire.png rename to theme/starlight/icons/newswire.png diff --git a/img/icons/starlight/pagedown.png b/theme/starlight/icons/pagedown.png similarity index 100% rename from img/icons/starlight/pagedown.png rename to theme/starlight/icons/pagedown.png diff --git a/img/icons/starlight/pageup.png b/theme/starlight/icons/pageup.png similarity index 100% rename from img/icons/starlight/pageup.png rename to theme/starlight/icons/pageup.png diff --git a/img/icons/starlight/person.png b/theme/starlight/icons/person.png similarity index 100% rename from img/icons/starlight/person.png rename to theme/starlight/icons/person.png diff --git a/img/icons/starlight/prev.png b/theme/starlight/icons/prev.png similarity index 100% rename from img/icons/starlight/prev.png rename to theme/starlight/icons/prev.png diff --git a/img/icons/starlight/publish.png b/theme/starlight/icons/publish.png similarity index 100% rename from img/icons/starlight/publish.png rename to theme/starlight/icons/publish.png diff --git a/img/icons/solidaric/qrcode.png b/theme/starlight/icons/qrcode.png similarity index 100% rename from img/icons/solidaric/qrcode.png rename to theme/starlight/icons/qrcode.png diff --git a/img/icons/starlight/repeat.png b/theme/starlight/icons/repeat.png similarity index 100% rename from img/icons/starlight/repeat.png rename to theme/starlight/icons/repeat.png diff --git a/img/icons/starlight/repeat_inactive.png b/theme/starlight/icons/repeat_inactive.png similarity index 100% rename from img/icons/starlight/repeat_inactive.png rename to theme/starlight/icons/repeat_inactive.png diff --git a/img/icons/starlight/reply.png b/theme/starlight/icons/reply.png similarity index 100% rename from img/icons/starlight/reply.png rename to theme/starlight/icons/reply.png diff --git a/img/icons/solidaric/rss3.png b/theme/starlight/icons/rss3.png similarity index 100% rename from img/icons/solidaric/rss3.png rename to theme/starlight/icons/rss3.png diff --git a/img/icons/starlight/scope_blog.png b/theme/starlight/icons/scope_blog.png similarity index 100% rename from img/icons/starlight/scope_blog.png rename to theme/starlight/icons/scope_blog.png diff --git a/img/icons/starlight/scope_dm.png b/theme/starlight/icons/scope_dm.png similarity index 100% rename from img/icons/starlight/scope_dm.png rename to theme/starlight/icons/scope_dm.png diff --git a/img/icons/starlight/scope_event.png b/theme/starlight/icons/scope_event.png similarity index 100% rename from img/icons/starlight/scope_event.png rename to theme/starlight/icons/scope_event.png diff --git a/img/icons/starlight/scope_followers.png b/theme/starlight/icons/scope_followers.png similarity index 100% rename from img/icons/starlight/scope_followers.png rename to theme/starlight/icons/scope_followers.png diff --git a/img/icons/starlight/scope_public.png b/theme/starlight/icons/scope_public.png similarity index 100% rename from img/icons/starlight/scope_public.png rename to theme/starlight/icons/scope_public.png diff --git a/img/icons/starlight/scope_question.png b/theme/starlight/icons/scope_question.png similarity index 100% rename from img/icons/starlight/scope_question.png rename to theme/starlight/icons/scope_question.png diff --git a/img/icons/starlight/scope_reminder.png b/theme/starlight/icons/scope_reminder.png similarity index 100% rename from img/icons/starlight/scope_reminder.png rename to theme/starlight/icons/scope_reminder.png diff --git a/img/icons/starlight/scope_report.png b/theme/starlight/icons/scope_report.png similarity index 100% rename from img/icons/starlight/scope_report.png rename to theme/starlight/icons/scope_report.png diff --git a/img/icons/starlight/scope_share.png b/theme/starlight/icons/scope_share.png similarity index 100% rename from img/icons/starlight/scope_share.png rename to theme/starlight/icons/scope_share.png diff --git a/img/icons/starlight/scope_unlisted.png b/theme/starlight/icons/scope_unlisted.png similarity index 100% rename from img/icons/starlight/scope_unlisted.png rename to theme/starlight/icons/scope_unlisted.png diff --git a/img/icons/starlight/search.png b/theme/starlight/icons/search.png similarity index 100% rename from img/icons/starlight/search.png rename to theme/starlight/icons/search.png diff --git a/img/icons/starlight/showhide.png b/theme/starlight/icons/showhide.png similarity index 100% rename from img/icons/starlight/showhide.png rename to theme/starlight/icons/showhide.png diff --git a/img/icons/starlight/unmute.png b/theme/starlight/icons/unmute.png similarity index 100% rename from img/icons/starlight/unmute.png rename to theme/starlight/icons/unmute.png diff --git a/img/icons/starlight/vote.png b/theme/starlight/icons/vote.png similarity index 100% rename from img/icons/starlight/vote.png rename to theme/starlight/icons/vote.png diff --git a/img/icons/add.png b/theme/zen/default/add.png similarity index 100% rename from img/icons/add.png rename to theme/zen/default/add.png diff --git a/img/icons/agpl.png b/theme/zen/default/agpl.png similarity index 100% rename from img/icons/agpl.png rename to theme/zen/default/agpl.png diff --git a/img/icons/avatar_news.png b/theme/zen/default/avatar_news.png similarity index 100% rename from img/icons/avatar_news.png rename to theme/zen/default/avatar_news.png diff --git a/img/icons/bookmark.png b/theme/zen/default/bookmark.png similarity index 100% rename from img/icons/bookmark.png rename to theme/zen/default/bookmark.png diff --git a/img/icons/night/bookmark_inactive.png b/theme/zen/default/bookmark_inactive.png similarity index 100% rename from img/icons/night/bookmark_inactive.png rename to theme/zen/default/bookmark_inactive.png diff --git a/img/icons/calendar.png b/theme/zen/default/calendar.png similarity index 100% rename from img/icons/calendar.png rename to theme/zen/default/calendar.png diff --git a/img/icons/calendar_notify.png b/theme/zen/default/calendar_notify.png similarity index 100% rename from img/icons/calendar_notify.png rename to theme/zen/default/calendar_notify.png diff --git a/img/icons/delete.png b/theme/zen/default/delete.png similarity index 100% rename from img/icons/delete.png rename to theme/zen/default/delete.png diff --git a/img/icons/dm.png b/theme/zen/default/dm.png similarity index 100% rename from img/icons/dm.png rename to theme/zen/default/dm.png diff --git a/img/icons/night/download.png b/theme/zen/default/download.png similarity index 100% rename from img/icons/night/download.png rename to theme/zen/default/download.png diff --git a/img/icons/edit.png b/theme/zen/default/edit.png similarity index 100% rename from img/icons/edit.png rename to theme/zen/default/edit.png diff --git a/img/icons/edit_notify.png b/theme/zen/default/edit_notify.png similarity index 100% rename from img/icons/edit_notify.png rename to theme/zen/default/edit_notify.png diff --git a/img/icons/favicon.ico b/theme/zen/default/favicon.ico similarity index 100% rename from img/icons/favicon.ico rename to theme/zen/default/favicon.ico diff --git a/img/icons/favicon.webp b/theme/zen/default/favicon.webp similarity index 100% rename from img/icons/favicon.webp rename to theme/zen/default/favicon.webp diff --git a/img/icons/like.png b/theme/zen/default/like.png similarity index 100% rename from img/icons/like.png rename to theme/zen/default/like.png diff --git a/img/icons/like_inactive.png b/theme/zen/default/like_inactive.png similarity index 100% rename from img/icons/like_inactive.png rename to theme/zen/default/like_inactive.png diff --git a/img/icons/night/links.png b/theme/zen/default/links.png similarity index 100% rename from img/icons/night/links.png rename to theme/zen/default/links.png diff --git a/img/icons/logorss.png b/theme/zen/default/logorss.png similarity index 100% rename from img/icons/logorss.png rename to theme/zen/default/logorss.png diff --git a/img/icons/night/logout.png b/theme/zen/default/logout.png similarity index 100% rename from img/icons/night/logout.png rename to theme/zen/default/logout.png diff --git a/img/icons/mute.png b/theme/zen/default/mute.png similarity index 100% rename from img/icons/mute.png rename to theme/zen/default/mute.png diff --git a/img/icons/new.png b/theme/zen/default/new.png similarity index 100% rename from img/icons/new.png rename to theme/zen/default/new.png diff --git a/img/icons/newpost.png b/theme/zen/default/newpost.png similarity index 100% rename from img/icons/newpost.png rename to theme/zen/default/newpost.png diff --git a/img/icons/newswire.png b/theme/zen/default/newswire.png similarity index 100% rename from img/icons/newswire.png rename to theme/zen/default/newswire.png diff --git a/img/icons/pagedown.png b/theme/zen/default/pagedown.png similarity index 100% rename from img/icons/pagedown.png rename to theme/zen/default/pagedown.png diff --git a/img/icons/pageup.png b/theme/zen/default/pageup.png similarity index 100% rename from img/icons/pageup.png rename to theme/zen/default/pageup.png diff --git a/img/icons/person.png b/theme/zen/default/person.png similarity index 100% rename from img/icons/person.png rename to theme/zen/default/person.png diff --git a/img/icons/prev.png b/theme/zen/default/prev.png similarity index 100% rename from img/icons/prev.png rename to theme/zen/default/prev.png diff --git a/img/icons/publish.png b/theme/zen/default/publish.png similarity index 100% rename from img/icons/publish.png rename to theme/zen/default/publish.png diff --git a/img/icons/starlight/qrcode.png b/theme/zen/default/qrcode.png similarity index 100% rename from img/icons/starlight/qrcode.png rename to theme/zen/default/qrcode.png diff --git a/img/icons/repeat.png b/theme/zen/default/repeat.png similarity index 100% rename from img/icons/repeat.png rename to theme/zen/default/repeat.png diff --git a/img/icons/repeat_inactive.png b/theme/zen/default/repeat_inactive.png similarity index 100% rename from img/icons/repeat_inactive.png rename to theme/zen/default/repeat_inactive.png diff --git a/img/icons/reply.png b/theme/zen/default/reply.png similarity index 100% rename from img/icons/reply.png rename to theme/zen/default/reply.png diff --git a/img/icons/starlight/rss3.png b/theme/zen/default/rss3.png similarity index 100% rename from img/icons/starlight/rss3.png rename to theme/zen/default/rss3.png diff --git a/img/icons/scope_blog.png b/theme/zen/default/scope_blog.png similarity index 100% rename from img/icons/scope_blog.png rename to theme/zen/default/scope_blog.png diff --git a/img/icons/scope_dm.png b/theme/zen/default/scope_dm.png similarity index 100% rename from img/icons/scope_dm.png rename to theme/zen/default/scope_dm.png diff --git a/img/icons/scope_event.png b/theme/zen/default/scope_event.png similarity index 100% rename from img/icons/scope_event.png rename to theme/zen/default/scope_event.png diff --git a/img/icons/scope_followers.png b/theme/zen/default/scope_followers.png similarity index 100% rename from img/icons/scope_followers.png rename to theme/zen/default/scope_followers.png diff --git a/img/icons/scope_public.png b/theme/zen/default/scope_public.png similarity index 100% rename from img/icons/scope_public.png rename to theme/zen/default/scope_public.png diff --git a/img/icons/scope_question.png b/theme/zen/default/scope_question.png similarity index 100% rename from img/icons/scope_question.png rename to theme/zen/default/scope_question.png diff --git a/img/icons/scope_reminder.png b/theme/zen/default/scope_reminder.png similarity index 100% rename from img/icons/scope_reminder.png rename to theme/zen/default/scope_reminder.png diff --git a/img/icons/scope_report.png b/theme/zen/default/scope_report.png similarity index 100% rename from img/icons/scope_report.png rename to theme/zen/default/scope_report.png diff --git a/img/icons/scope_share.png b/theme/zen/default/scope_share.png similarity index 100% rename from img/icons/scope_share.png rename to theme/zen/default/scope_share.png diff --git a/img/icons/scope_unlisted.png b/theme/zen/default/scope_unlisted.png similarity index 100% rename from img/icons/scope_unlisted.png rename to theme/zen/default/scope_unlisted.png diff --git a/img/icons/search.png b/theme/zen/default/search.png similarity index 100% rename from img/icons/search.png rename to theme/zen/default/search.png diff --git a/img/icons/showhide.png b/theme/zen/default/showhide.png similarity index 100% rename from img/icons/showhide.png rename to theme/zen/default/showhide.png diff --git a/img/icons/unmute.png b/theme/zen/default/unmute.png similarity index 100% rename from img/icons/unmute.png rename to theme/zen/default/unmute.png diff --git a/img/icons/vote.png b/theme/zen/default/vote.png similarity index 100% rename from img/icons/vote.png rename to theme/zen/default/vote.png diff --git a/img/icons/zen/add.png b/theme/zen/icons/add.png similarity index 100% rename from img/icons/zen/add.png rename to theme/zen/icons/add.png diff --git a/img/icons/zen/avatar_news.png b/theme/zen/icons/avatar_news.png similarity index 100% rename from img/icons/zen/avatar_news.png rename to theme/zen/icons/avatar_news.png diff --git a/img/icons/zen/bookmark.png b/theme/zen/icons/bookmark.png similarity index 100% rename from img/icons/zen/bookmark.png rename to theme/zen/icons/bookmark.png diff --git a/img/icons/zen/bookmark_inactive.png b/theme/zen/icons/bookmark_inactive.png similarity index 100% rename from img/icons/zen/bookmark_inactive.png rename to theme/zen/icons/bookmark_inactive.png diff --git a/img/icons/zen/calendar.png b/theme/zen/icons/calendar.png similarity index 100% rename from img/icons/zen/calendar.png rename to theme/zen/icons/calendar.png diff --git a/img/icons/zen/calendar_notify.png b/theme/zen/icons/calendar_notify.png similarity index 100% rename from img/icons/zen/calendar_notify.png rename to theme/zen/icons/calendar_notify.png diff --git a/img/icons/zen/delete.png b/theme/zen/icons/delete.png similarity index 100% rename from img/icons/zen/delete.png rename to theme/zen/icons/delete.png diff --git a/img/icons/zen/dm.png b/theme/zen/icons/dm.png similarity index 100% rename from img/icons/zen/dm.png rename to theme/zen/icons/dm.png diff --git a/img/icons/zen/download.png b/theme/zen/icons/download.png similarity index 100% rename from img/icons/zen/download.png rename to theme/zen/icons/download.png diff --git a/img/icons/zen/edit.png b/theme/zen/icons/edit.png similarity index 100% rename from img/icons/zen/edit.png rename to theme/zen/icons/edit.png diff --git a/img/icons/zen/edit_notify.png b/theme/zen/icons/edit_notify.png similarity index 100% rename from img/icons/zen/edit_notify.png rename to theme/zen/icons/edit_notify.png diff --git a/img/icons/zen/like.png b/theme/zen/icons/like.png similarity index 100% rename from img/icons/zen/like.png rename to theme/zen/icons/like.png diff --git a/img/icons/zen/like_inactive.png b/theme/zen/icons/like_inactive.png similarity index 100% rename from img/icons/zen/like_inactive.png rename to theme/zen/icons/like_inactive.png diff --git a/img/icons/zen/links.png b/theme/zen/icons/links.png similarity index 100% rename from img/icons/zen/links.png rename to theme/zen/icons/links.png diff --git a/img/icons/zen/logorss.png b/theme/zen/icons/logorss.png similarity index 100% rename from img/icons/zen/logorss.png rename to theme/zen/icons/logorss.png diff --git a/img/icons/zen/logout.png b/theme/zen/icons/logout.png similarity index 100% rename from img/icons/zen/logout.png rename to theme/zen/icons/logout.png diff --git a/img/icons/zen/mute.png b/theme/zen/icons/mute.png similarity index 100% rename from img/icons/zen/mute.png rename to theme/zen/icons/mute.png diff --git a/img/icons/zen/new.png b/theme/zen/icons/new.png similarity index 100% rename from img/icons/zen/new.png rename to theme/zen/icons/new.png diff --git a/img/icons/zen/newpost.png b/theme/zen/icons/newpost.png similarity index 100% rename from img/icons/zen/newpost.png rename to theme/zen/icons/newpost.png diff --git a/img/icons/zen/newswire.png b/theme/zen/icons/newswire.png similarity index 100% rename from img/icons/zen/newswire.png rename to theme/zen/icons/newswire.png diff --git a/img/icons/zen/pagedown.png b/theme/zen/icons/pagedown.png similarity index 100% rename from img/icons/zen/pagedown.png rename to theme/zen/icons/pagedown.png diff --git a/img/icons/zen/pageup.png b/theme/zen/icons/pageup.png similarity index 100% rename from img/icons/zen/pageup.png rename to theme/zen/icons/pageup.png diff --git a/img/icons/zen/person.png b/theme/zen/icons/person.png similarity index 100% rename from img/icons/zen/person.png rename to theme/zen/icons/person.png diff --git a/img/icons/zen/prev.png b/theme/zen/icons/prev.png similarity index 100% rename from img/icons/zen/prev.png rename to theme/zen/icons/prev.png diff --git a/img/icons/zen/publish.png b/theme/zen/icons/publish.png similarity index 100% rename from img/icons/zen/publish.png rename to theme/zen/icons/publish.png diff --git a/img/icons/zen/qrcode.png b/theme/zen/icons/qrcode.png similarity index 100% rename from img/icons/zen/qrcode.png rename to theme/zen/icons/qrcode.png diff --git a/img/icons/zen/repeat.png b/theme/zen/icons/repeat.png similarity index 100% rename from img/icons/zen/repeat.png rename to theme/zen/icons/repeat.png diff --git a/img/icons/zen/repeat_inactive.png b/theme/zen/icons/repeat_inactive.png similarity index 100% rename from img/icons/zen/repeat_inactive.png rename to theme/zen/icons/repeat_inactive.png diff --git a/img/icons/zen/reply.png b/theme/zen/icons/reply.png similarity index 100% rename from img/icons/zen/reply.png rename to theme/zen/icons/reply.png diff --git a/img/icons/zen/rss3.png b/theme/zen/icons/rss3.png similarity index 100% rename from img/icons/zen/rss3.png rename to theme/zen/icons/rss3.png diff --git a/img/icons/zen/scope_blog.png b/theme/zen/icons/scope_blog.png similarity index 100% rename from img/icons/zen/scope_blog.png rename to theme/zen/icons/scope_blog.png diff --git a/img/icons/zen/scope_dm.png b/theme/zen/icons/scope_dm.png similarity index 100% rename from img/icons/zen/scope_dm.png rename to theme/zen/icons/scope_dm.png diff --git a/img/icons/zen/scope_event.png b/theme/zen/icons/scope_event.png similarity index 100% rename from img/icons/zen/scope_event.png rename to theme/zen/icons/scope_event.png diff --git a/img/icons/zen/scope_followers.png b/theme/zen/icons/scope_followers.png similarity index 100% rename from img/icons/zen/scope_followers.png rename to theme/zen/icons/scope_followers.png diff --git a/img/icons/zen/scope_public.png b/theme/zen/icons/scope_public.png similarity index 100% rename from img/icons/zen/scope_public.png rename to theme/zen/icons/scope_public.png diff --git a/img/icons/zen/scope_question.png b/theme/zen/icons/scope_question.png similarity index 100% rename from img/icons/zen/scope_question.png rename to theme/zen/icons/scope_question.png diff --git a/img/icons/zen/scope_reminder.png b/theme/zen/icons/scope_reminder.png similarity index 100% rename from img/icons/zen/scope_reminder.png rename to theme/zen/icons/scope_reminder.png diff --git a/img/icons/zen/scope_report.png b/theme/zen/icons/scope_report.png similarity index 100% rename from img/icons/zen/scope_report.png rename to theme/zen/icons/scope_report.png diff --git a/img/icons/zen/scope_share.png b/theme/zen/icons/scope_share.png similarity index 100% rename from img/icons/zen/scope_share.png rename to theme/zen/icons/scope_share.png diff --git a/img/icons/zen/scope_unlisted.png b/theme/zen/icons/scope_unlisted.png similarity index 100% rename from img/icons/zen/scope_unlisted.png rename to theme/zen/icons/scope_unlisted.png diff --git a/img/icons/zen/search.png b/theme/zen/icons/search.png similarity index 100% rename from img/icons/zen/search.png rename to theme/zen/icons/search.png diff --git a/img/icons/zen/showhide.png b/theme/zen/icons/showhide.png similarity index 100% rename from img/icons/zen/showhide.png rename to theme/zen/icons/showhide.png diff --git a/img/icons/zen/unmute.png b/theme/zen/icons/unmute.png similarity index 100% rename from img/icons/zen/unmute.png rename to theme/zen/icons/unmute.png diff --git a/img/icons/zen/vote.png b/theme/zen/icons/vote.png similarity index 100% rename from img/icons/zen/vote.png rename to theme/zen/icons/vote.png diff --git a/webapp_utils.py b/webapp_utils.py index 9002c5a1a..d19ecbea5 100644 --- a/webapp_utils.py +++ b/webapp_utils.py @@ -281,12 +281,12 @@ def getPersonAvatarUrl(baseDir: str, personUrl: str, personCache: {}, def getIconsDir(baseDir: str) -> str: - """Returns the directory where icons exist + """Returns the web path where icons exist """ iconsDir = 'icons' theme = getConfigParam(baseDir, 'theme') if theme: - if os.path.isdir(baseDir + '/img/icons/' + theme): + if os.path.isdir(baseDir + '/theme/' + theme + '/icons'): iconsDir = 'icons/' + theme return iconsDir @@ -726,10 +726,11 @@ def htmlPostSeparator(baseDir: str, column: str) -> str: """Returns the html for a timeline post separator image """ iconsDir = getIconsDir(baseDir) + theme = getConfigParam(baseDir, 'theme') filename = 'separator.png' if column: filename = 'separator_' + column + '.png' - separatorImageFilename = baseDir + '/img/' + iconsDir + '/' + filename + separatorImageFilename = baseDir + '/theme/' + theme + '/icons/' + filename separatorStr = '' if os.path.isfile(separatorImageFilename): separatorStr = \