diff --git a/resources/lib/itemtypes.py b/resources/lib/itemtypes.py
index 7c85db54..09ad964f 100644
--- a/resources/lib/itemtypes.py
+++ b/resources/lib/itemtypes.py
@@ -1310,8 +1310,8 @@ class TVShows(Items):
             self.logMsg("UPDATE episode itemid: %s - Title: %s" % (itemid, title), 1)
 
             # Update the movie entry
-            if kodiversion == 16:
-                # Kodi Jarvis
+            if kodiversion in (16, 17):
+                # Kodi Jarvis, Krypton
                 query = ' '.join((
                 
                     "UPDATE episode",
@@ -1349,8 +1349,8 @@ class TVShows(Items):
             fileid = kodi_db.addFile(filename, pathid)
             
             # Create the episode entry
-            if kodiversion == 16:
-                # Kodi Jarvis
+            if kodiversion in (16, 17):
+                # Kodi Jarvis, Krypton
                 query = (
                     '''
                     INSERT INTO episode(
@@ -1724,7 +1724,7 @@ class Music(Items):
             
 
         # Process the artist
-        if kodiversion == 16:
+        if self.kodiversion in (16, 17):
             query = ' '.join((
 
                 "UPDATE artist",
@@ -1811,7 +1811,18 @@ class Music(Items):
 
 
         # Process the album info
-        if kodiversion == 16:
+        if kodiversion == 17:
+            # Kodi Krypton
+            query = ' '.join((
+
+                "UPDATE album",
+                "SET strArtists = ?, iYear = ?, strGenres = ?, strReview = ?, strImage = ?,",
+                    "iUserrating = ?, lastScraped = ?, strReleaseType = ?",
+                "WHERE idAlbum = ?"
+            ))
+            kodicursor.execute(query, (artistname, year, genre, bio, thumb, rating, lastScraped,
+                "album", albumid))
+        elif kodiversion == 16:
             # Kodi Jarvis
             query = ' '.join((
 
@@ -2032,8 +2043,8 @@ class Music(Items):
                 # No album found, create a single's album
                 kodicursor.execute("select coalesce(max(idAlbum),0) from album")
                 albumid = kodicursor.fetchone()[0] + 1
-                if kodiversion == 16:
-                    # Kodi Jarvis
+                if kodiversion in (16, 17):
+                    # Kodi Jarvis, Krypton
                     query = (
                         '''
                         INSERT INTO album(idAlbum, strGenres, iYear, strReleaseType)
@@ -2144,8 +2155,8 @@ class Music(Items):
         else:
             if addArtist:
                 artists_onalbum = " / ".join(artists_name)
-                if kodiversion == 16:
-                    # Kodi Jarvis
+                if kodiversion in (16, 17):
+                    # Kodi Jarvis, Krypton
                     query = "UPDATE album SET strArtists = ? WHERE idAlbum = ?"
                     kodicursor.execute(query, (artists_onalbum, albumid))
                 elif kodiversion == 15:
diff --git a/resources/lib/kodidb_functions.py b/resources/lib/kodidb_functions.py
index 686ac676..3929bb52 100644
--- a/resources/lib/kodidb_functions.py
+++ b/resources/lib/kodidb_functions.py
@@ -141,8 +141,8 @@ class Kodidb_Functions():
         
         cursor = self.cursor
         
-        if self.kodiversion in (15, 16):
-            # Kodi Isengard, Jarvis
+        if self.kodiversion in (15, 16, 17):
+            # Kodi Isengard, Jarvis, Krypton
             for country in countries:
                 query = ' '.join((
 
@@ -225,8 +225,8 @@ class Kodidb_Functions():
             type = person['Type']
             thumb = person['imageurl']
             
-            # Kodi Isengard, Jarvis
-            if kodiversion in (15, 16):
+            # Kodi Isengard, Jarvis, Krypton
+            if kodiversion in (15, 16, 17):
                 query = ' '.join((
 
                     "SELECT actor_id",
@@ -422,8 +422,8 @@ class Kodidb_Functions():
 
         cursor = self.cursor
         
-        # Kodi Isengard, Jarvis
-        if self.kodiversion in (15, 16):
+        # Kodi Isengard, Jarvis, Krypton
+        if self.kodiversion in (15, 16, 17):
             # Delete current genres for clean slate
             query = ' '.join((
 
@@ -542,8 +542,8 @@ class Kodidb_Functions():
 
         for studio in studios:
 
-            if kodiversion in (15, 16):
-                # Kodi Isengard, Jarvis
+            if kodiversion in (15, 16, 17):
+                # Kodi Isengard, Jarvis, Krypton
                 query = ' '.join((
 
                     "SELECT studio_id",
@@ -710,8 +710,8 @@ class Kodidb_Functions():
         cursor = self.cursor
         
         # First, delete any existing tags associated to the id
-        if self.kodiversion in (15, 16):
-            # Kodi Isengard, Jarvis
+        if self.kodiversion in (15, 16, 17):
+            # Kodi Isengard, Jarvis, Krypton
             query = ' '.join((
 
                 "DELETE FROM tag_link",
@@ -738,8 +738,8 @@ class Kodidb_Functions():
 
         cursor = self.cursor
 
-        if self.kodiversion in (15, 16):
-            # Kodi Isengard, Jarvis
+        if self.kodiversion in (15, 16, 17):
+            # Kodi Isengard, Jarvis, Krypton
             query = ' '.join((
 
                 "SELECT tag_id",
@@ -802,8 +802,8 @@ class Kodidb_Functions():
         cursor = self.cursor
 
         # This will create and return the tag_id
-        if self.kodiversion in (15, 16):
-            # Kodi Isengard, Jarvis
+        if self.kodiversion in (15, 16, 17):
+            # Kodi Isengard, Jarvis, Krypton
             query = ' '.join((
 
                 "SELECT tag_id",
@@ -850,8 +850,8 @@ class Kodidb_Functions():
         cursor = self.cursor
         self.logMsg("Updating: %s with %s for %s: %s" % (oldtag, newtag, mediatype, kodiid), 2)
         
-        if self.kodiversion in (15, 16):
-            # Kodi Isengard, Jarvis
+        if self.kodiversion in (15, 16, 17):
+            # Kodi Isengard, Jarvis, Krypton
             try: 
                 query = ' '.join((
 
@@ -903,8 +903,8 @@ class Kodidb_Functions():
 
         cursor = self.cursor
 
-        if self.kodiversion in (15, 16):
-            # Kodi Isengard, Jarvis
+        if self.kodiversion in (15, 16, 17):
+            # Kodi Isengard, Jarvis, Krypton
             query = ' '.join((
 
                 "SELECT tag_id",