diff --git a/server.py b/server.py
index 4d3f435..23bedd8 100755
--- a/server.py
+++ b/server.py
@@ -147,7 +147,8 @@ def index():
     global command
     all_features = ['Current Weather','Daily Forecast','News', 'Sports (Upcoming Games)','Sports (Past Games)','Sports (Live Games)',
                     'Sports (Team Stats)','Custom Images', 'Custom GIFs', 'Custom Messages', 'Stocks', 'Crypto', 'Forex', 'Commodities', 'Indices', 'Movies',
-		    'IPO Calendar', 'Economic Calendar', 'Jokes', 'Gainers, Losers, Active', 'Sector Performance', 'Place (Reddit)', 'Clock 1' , 'Clock 2', 'World Clock']
+		    'IPO Calendar', 'Economic Calendar', 'Jokes', 'Gainers, Losers, Active', 'Sector Performance', 'Place (Reddit)', 'Clock 1' , 'Clock 2',
+		    'World Clock', 'Inspirational Quotes']
     
     global professional
     
@@ -749,11 +750,11 @@ def save_displaying(input_settings):
     global professional
   
     all_settings = ['Stocks', 'Crypto', 'Forex', 'Commodities', 'Indices', 'Current Weather', 'Daily Forecast', 'News', 'Sports (Upcoming Games)', 'Sports (Past Games)',
-                    'Sports (Live Games)', 'Sports (Team Stats)', 'Custom Images', 'Custom GIFs', 'Custom Messages', 'Movies', 'IPO Calendar', 'Economic Calendar', 'Jokes', 'Gainers, Losers, Active', 'Sector Performance', 'Place (Reddit)', 'Clock 1', 'Clock 2', 'World Clock']
+                    'Sports (Live Games)', 'Sports (Team Stats)', 'Custom Images', 'Custom GIFs', 'Custom Messages', 'Movies', 'IPO Calendar', 'Economic Calendar', 'Jokes', 'Gainers, Losers, Active', 'Sector Performance', 'Place (Reddit)', 'Clock 1', 'Clock 2', 'World Clock', 'Inspirational Quotes']
     professional = len(input_settings) == 2
     if professional:
         all_settings = ['Stocks', 'Crypto', 'Forex', 'Commodities', 'Indices', 'Current Weather', 'News', 'Daily Forecast', 'Sports (Upcoming Games)',
-                        'Sports (Past Games)', 'Sports (Team Stats)', 'Sports (Live Games)', 'Custom Messages', 'Custom Images', 'Movies', 'IPO Calendar', 'Economic Calendar', 'Jokes', 'Gainers, Losers, Active', 'Sector Performance', 'Place (Reddit)', 'Clock 1', 'Clock 2', 'World Clock']
+                        'Sports (Past Games)', 'Sports (Team Stats)', 'Sports (Live Games)', 'Custom Messages', 'Custom Images', 'Movies', 'IPO Calendar', 'Economic Calendar', 'Jokes', 'Gainers, Losers, Active', 'Sector Performance', 'Place (Reddit)', 'Clock 1', 'Clock 2', 'World Clock', 'Inspirational Quotes']
         
     positions = []
     display_settings = []
@@ -921,6 +922,8 @@ def save():
         save_clock2_settings(input_settings)
     elif feature == 'World Clock':
         save_worldclock_settings(input_settings)
+    elif feature == 'Inspirational Quotes':
+        save_quotes_settings(input_settings)
     elif feature in ['Custom GIFs', 'Custom Images']:
 
         images = request.files
@@ -1765,6 +1768,29 @@ def save_worldclock_settings(input_settings):
         with open('csv/worldclock_settings.json', 'w') as f:
             json.dump(current_settings, f)
 
+def save_quotes_settings(input_settings):
+    filename = 'quotes_settings.json'
+    try:
+        f = open('csv/' + filename, 'r')
+        current_settings = json.load(f)
+        f.close()
+    except:
+        current_settings = {"feature": "Inspirational Quotes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "amount": "3", "quotes": []}
+
+    current_settings['speed'] = input_settings['speed'].lower()
+    current_settings['speed2'] = input_settings['speed2'].lower()
+    current_settings['animation'] = input_settings['animation'].lower()
+    current_settings['title'] = input_settings['title']
+    current_settings['amount'] = input_settings['amount']
+    try:
+        f = open('csv/' + filename, 'w')
+        json.dump(current_settings, f)
+        f.close()
+    except:
+        with open('csv/quotes_settings.json', 'w') as f:
+            json.dump(current_settings, f)
+
+
 def save_place_settings(input_settings):
     filename = 'place_settings.json'
     try: