diff --git a/img/banner_indymedia.png b/img/banner_indymediaclassic.png
similarity index 100%
rename from img/banner_indymedia.png
rename to img/banner_indymediaclassic.png
diff --git a/img/icons/indymedia/add.png b/img/icons/indymediaclassic/add.png
similarity index 100%
rename from img/icons/indymedia/add.png
rename to img/icons/indymediaclassic/add.png
diff --git a/img/icons/indymedia/avatar_news.png b/img/icons/indymediaclassic/avatar_news.png
similarity index 100%
rename from img/icons/indymedia/avatar_news.png
rename to img/icons/indymediaclassic/avatar_news.png
diff --git a/img/icons/indymedia/bookmark.png b/img/icons/indymediaclassic/bookmark.png
similarity index 100%
rename from img/icons/indymedia/bookmark.png
rename to img/icons/indymediaclassic/bookmark.png
diff --git a/img/icons/indymedia/bookmark_inactive.png b/img/icons/indymediaclassic/bookmark_inactive.png
similarity index 100%
rename from img/icons/indymedia/bookmark_inactive.png
rename to img/icons/indymediaclassic/bookmark_inactive.png
diff --git a/img/icons/indymedia/calendar.png b/img/icons/indymediaclassic/calendar.png
similarity index 100%
rename from img/icons/indymedia/calendar.png
rename to img/icons/indymediaclassic/calendar.png
diff --git a/img/icons/indymedia/calendar_notify.png b/img/icons/indymediaclassic/calendar_notify.png
similarity index 100%
rename from img/icons/indymedia/calendar_notify.png
rename to img/icons/indymediaclassic/calendar_notify.png
diff --git a/img/icons/indymedia/delete.png b/img/icons/indymediaclassic/delete.png
similarity index 100%
rename from img/icons/indymedia/delete.png
rename to img/icons/indymediaclassic/delete.png
diff --git a/img/icons/indymedia/dm.png b/img/icons/indymediaclassic/dm.png
similarity index 100%
rename from img/icons/indymedia/dm.png
rename to img/icons/indymediaclassic/dm.png
diff --git a/img/icons/indymedia/download.png b/img/icons/indymediaclassic/download.png
similarity index 100%
rename from img/icons/indymedia/download.png
rename to img/icons/indymediaclassic/download.png
diff --git a/img/icons/indymedia/edit.png b/img/icons/indymediaclassic/edit.png
similarity index 100%
rename from img/icons/indymedia/edit.png
rename to img/icons/indymediaclassic/edit.png
diff --git a/img/icons/indymedia/edit_notify.png b/img/icons/indymediaclassic/edit_notify.png
similarity index 100%
rename from img/icons/indymedia/edit_notify.png
rename to img/icons/indymediaclassic/edit_notify.png
diff --git a/img/icons/indymedia/like.png b/img/icons/indymediaclassic/like.png
similarity index 100%
rename from img/icons/indymedia/like.png
rename to img/icons/indymediaclassic/like.png
diff --git a/img/icons/indymedia/like_inactive.png b/img/icons/indymediaclassic/like_inactive.png
similarity index 100%
rename from img/icons/indymedia/like_inactive.png
rename to img/icons/indymediaclassic/like_inactive.png
diff --git a/img/icons/indymedia/links.png b/img/icons/indymediaclassic/links.png
similarity index 100%
rename from img/icons/indymedia/links.png
rename to img/icons/indymediaclassic/links.png
diff --git a/img/icons/indymedia/logorss.png b/img/icons/indymediaclassic/logorss.png
similarity index 100%
rename from img/icons/indymedia/logorss.png
rename to img/icons/indymediaclassic/logorss.png
diff --git a/img/icons/indymedia/mute.png b/img/icons/indymediaclassic/mute.png
similarity index 100%
rename from img/icons/indymedia/mute.png
rename to img/icons/indymediaclassic/mute.png
diff --git a/img/icons/indymedia/new.png b/img/icons/indymediaclassic/new.png
similarity index 100%
rename from img/icons/indymedia/new.png
rename to img/icons/indymediaclassic/new.png
diff --git a/img/icons/indymedia/newpost.png b/img/icons/indymediaclassic/newpost.png
similarity index 100%
rename from img/icons/indymedia/newpost.png
rename to img/icons/indymediaclassic/newpost.png
diff --git a/img/icons/indymedia/newswire.png b/img/icons/indymediaclassic/newswire.png
similarity index 100%
rename from img/icons/indymedia/newswire.png
rename to img/icons/indymediaclassic/newswire.png
diff --git a/img/icons/indymedia/pagedown.png b/img/icons/indymediaclassic/pagedown.png
similarity index 100%
rename from img/icons/indymedia/pagedown.png
rename to img/icons/indymediaclassic/pagedown.png
diff --git a/img/icons/indymedia/pageup.png b/img/icons/indymediaclassic/pageup.png
similarity index 100%
rename from img/icons/indymedia/pageup.png
rename to img/icons/indymediaclassic/pageup.png
diff --git a/img/icons/indymedia/person.png b/img/icons/indymediaclassic/person.png
similarity index 100%
rename from img/icons/indymedia/person.png
rename to img/icons/indymediaclassic/person.png
diff --git a/img/icons/indymedia/prev.png b/img/icons/indymediaclassic/prev.png
similarity index 100%
rename from img/icons/indymedia/prev.png
rename to img/icons/indymediaclassic/prev.png
diff --git a/img/icons/indymedia/qrcode.png b/img/icons/indymediaclassic/qrcode.png
similarity index 100%
rename from img/icons/indymedia/qrcode.png
rename to img/icons/indymediaclassic/qrcode.png
diff --git a/img/icons/indymedia/repeat.png b/img/icons/indymediaclassic/repeat.png
similarity index 100%
rename from img/icons/indymedia/repeat.png
rename to img/icons/indymediaclassic/repeat.png
diff --git a/img/icons/indymedia/repeat_inactive.png b/img/icons/indymediaclassic/repeat_inactive.png
similarity index 100%
rename from img/icons/indymedia/repeat_inactive.png
rename to img/icons/indymediaclassic/repeat_inactive.png
diff --git a/img/icons/indymedia/reply.png b/img/icons/indymediaclassic/reply.png
similarity index 100%
rename from img/icons/indymedia/reply.png
rename to img/icons/indymediaclassic/reply.png
diff --git a/img/icons/indymedia/rss3.png b/img/icons/indymediaclassic/rss3.png
similarity index 100%
rename from img/icons/indymedia/rss3.png
rename to img/icons/indymediaclassic/rss3.png
diff --git a/img/icons/indymedia/scope_blog.png b/img/icons/indymediaclassic/scope_blog.png
similarity index 100%
rename from img/icons/indymedia/scope_blog.png
rename to img/icons/indymediaclassic/scope_blog.png
diff --git a/img/icons/indymedia/scope_dm.png b/img/icons/indymediaclassic/scope_dm.png
similarity index 100%
rename from img/icons/indymedia/scope_dm.png
rename to img/icons/indymediaclassic/scope_dm.png
diff --git a/img/icons/indymedia/scope_event.png b/img/icons/indymediaclassic/scope_event.png
similarity index 100%
rename from img/icons/indymedia/scope_event.png
rename to img/icons/indymediaclassic/scope_event.png
diff --git a/img/icons/indymedia/scope_followers.png b/img/icons/indymediaclassic/scope_followers.png
similarity index 100%
rename from img/icons/indymedia/scope_followers.png
rename to img/icons/indymediaclassic/scope_followers.png
diff --git a/img/icons/indymedia/scope_public.png b/img/icons/indymediaclassic/scope_public.png
similarity index 100%
rename from img/icons/indymedia/scope_public.png
rename to img/icons/indymediaclassic/scope_public.png
diff --git a/img/icons/indymedia/scope_question.png b/img/icons/indymediaclassic/scope_question.png
similarity index 100%
rename from img/icons/indymedia/scope_question.png
rename to img/icons/indymediaclassic/scope_question.png
diff --git a/img/icons/indymedia/scope_reminder.png b/img/icons/indymediaclassic/scope_reminder.png
similarity index 100%
rename from img/icons/indymedia/scope_reminder.png
rename to img/icons/indymediaclassic/scope_reminder.png
diff --git a/img/icons/indymedia/scope_report.png b/img/icons/indymediaclassic/scope_report.png
similarity index 100%
rename from img/icons/indymedia/scope_report.png
rename to img/icons/indymediaclassic/scope_report.png
diff --git a/img/icons/indymedia/scope_share.png b/img/icons/indymediaclassic/scope_share.png
similarity index 100%
rename from img/icons/indymedia/scope_share.png
rename to img/icons/indymediaclassic/scope_share.png
diff --git a/img/icons/indymedia/scope_unlisted.png b/img/icons/indymediaclassic/scope_unlisted.png
similarity index 100%
rename from img/icons/indymedia/scope_unlisted.png
rename to img/icons/indymediaclassic/scope_unlisted.png
diff --git a/img/icons/indymedia/search.png b/img/icons/indymediaclassic/search.png
similarity index 100%
rename from img/icons/indymedia/search.png
rename to img/icons/indymediaclassic/search.png
diff --git a/img/icons/indymedia/showhide.png b/img/icons/indymediaclassic/showhide.png
similarity index 100%
rename from img/icons/indymedia/showhide.png
rename to img/icons/indymediaclassic/showhide.png
diff --git a/img/icons/indymedia/unmute.png b/img/icons/indymediaclassic/unmute.png
similarity index 100%
rename from img/icons/indymedia/unmute.png
rename to img/icons/indymediaclassic/unmute.png
diff --git a/img/icons/indymedia/vote.png b/img/icons/indymediaclassic/vote.png
similarity index 100%
rename from img/icons/indymedia/vote.png
rename to img/icons/indymediaclassic/vote.png
diff --git a/img/image_indymedia.png b/img/image_indymediaclassic.png
similarity index 100%
rename from img/image_indymedia.png
rename to img/image_indymediaclassic.png
diff --git a/img/left_col_image_indymedia.png b/img/left_col_image_indymediaclassic.png
similarity index 100%
rename from img/left_col_image_indymedia.png
rename to img/left_col_image_indymediaclassic.png
diff --git a/img/login_background_indymedia.jpg b/img/login_background_indymediaclassic.jpg
similarity index 100%
rename from img/login_background_indymedia.jpg
rename to img/login_background_indymediaclassic.jpg
diff --git a/img/options_background_indymedia.jpg b/img/options_background_indymediaclassic.jpg
similarity index 100%
rename from img/options_background_indymedia.jpg
rename to img/options_background_indymediaclassic.jpg
diff --git a/img/right_col_image_indymedia.png b/img/right_col_image_indymediaclassic.png
similarity index 100%
rename from img/right_col_image_indymedia.png
rename to img/right_col_image_indymediaclassic.png
diff --git a/img/screenshot_indymedia.jpg b/img/screenshot_indymediaclassic.jpg
similarity index 100%
rename from img/screenshot_indymedia.jpg
rename to img/screenshot_indymediaclassic.jpg
diff --git a/img/search_banner_indymedia.png b/img/search_banner_indymediaclassic.png
similarity index 100%
rename from img/search_banner_indymedia.png
rename to img/search_banner_indymediaclassic.png
diff --git a/theme.py b/theme.py
index 750adb617..4493da989 100644
--- a/theme.py
+++ b/theme.py
@@ -25,8 +25,9 @@ def getThemesList() -> []:
     and to lookup function names
     """
     return ('Default', 'Blue', 'Hacker', 'Henge', 'HighVis',
-            'Indymedia', 'LCD', 'Light', 'Night', 'Purple',
-            'Solidaric', 'Starlight', 'Zen')
+            'IndymediaClassic',
+            'LCD', 'Light', 'Night', 'Purple', 'Solidaric',
+            'Starlight', 'Zen')
 
 
 def setThemeInConfig(baseDir: str, name: str) -> bool:
@@ -243,7 +244,7 @@ def setThemeDefault(baseDir: str):
     setThemeFromDict(baseDir, name, themeParams, bgParams)
 
 
-def setThemeIndymedia(baseDir: str):
+def setThemeIndymediaClassic(baseDir: str):
     name = 'indymedia'
     removeTheme(baseDir)
     setThemeInConfig(baseDir, name)