diff --git a/dosagelib/plugins/cyantian.py b/dosagelib/plugins/cyantian.py
index 201a66460..16d8c9206 100644
--- a/dosagelib/plugins/cyantian.py
+++ b/dosagelib/plugins/cyantian.py
@@ -50,3 +50,44 @@ class TheCyantianChronicles(_WordPressScraper):
             cls('RandomRamblings', 'random-ramblings', 'darrik'),
             cls('SinkOrSwim', 'sos', 'sink-or-swim', last='ricochete-and-seraphim')
         )
+
+
+class Shivae(_WordPressScraper):
+    url = 'http://shivae.com/'
+    stripUrl = url + 'gnip/%s/'
+    firstStripUrl = stripUrl % 'cler/09202001'
+
+
+class ShivaeComics(_WordPressScraper):
+    baseUrl = 'http://shivae.net/'
+
+    def __init__(self, name, story, first, last=None, nav=None):
+        super(ShivaeComics, self).__init__('Shivae/' + name)
+
+        self.url = self.baseUrl + story + '/'
+        self.stripUrl = self.url + 'comic/%s/'
+        self.firstStripUrl = self.stripUrl % first
+
+        self.nav = nav
+
+        if last:
+            self.url = self.stripUrl % last
+            self.endOfLife = True
+
+    def getPrevUrl(self, url, data):
+        # Missing/broken navigation links
+        url = url.rstrip('/').rsplit('/', 1)[-1]
+        if self.nav and url in self.nav:
+            return self.stripUrl % self.nav[url]
+        return super(ShivaeComics, self).getPrevUrl(url, data)
+
+    @classmethod
+    def getmodules(cls):
+        return (
+            cls('BlackRose', 'blackrose', '11012004'),
+            cls('CafeAnime', 'cafeanime', '08172004', last='09192009'),
+            cls('Extras', 'extras', '01012012', nav={'12302012': '08152013'}),
+            cls('Pure', 'pure', '04082002', last='chapter-6-page-1'),
+            cls('SerinFairyHunter', 'serin', 'character-serin'),
+            cls('SivineBlades', 'sivine', '06302002', last='10242008')
+        )
diff --git a/dosagelib/plugins/s.py b/dosagelib/plugins/s.py
index a537c268f..d8ac288cc 100644
--- a/dosagelib/plugins/s.py
+++ b/dosagelib/plugins/s.py
@@ -215,11 +215,6 @@ class ShipInABottle(_WPNavi):
     help = 'Index format: number'
 
 
-class Shivae(_WordPressScraper):
-    url = 'http://shivae.com/'
-    firstStripUrl = url + 'gnip/ck-chapter-01/caidenkoel-title-01/'
-
-
 class Shortpacked(_ParserScraper):
     url = 'http://www.shortpacked.com/index.php'
     stripUrl = url + '?id=%s'