diff --git a/.gitignore b/.gitignore
index 7d3db1bd..00b78bb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ public/
 *.compiled.*
 settings.json
 *.shot
-
+*.ccg
 
 # Folder config file #
 ######################
diff --git a/client/components/RoutingStorage.tsx b/client/components/RoutingStorage.tsx
index 8e7da457..b4c7c2e8 100644
--- a/client/components/RoutingStorage.tsx
+++ b/client/components/RoutingStorage.tsx
@@ -8,7 +8,8 @@ import {
     SOCKET_GET_SNAPSHOT_LIST, 
     SOCKET_LOAD_SNAPSHOT, 
     SOCKET_SAVE_SNAPSHOT,
-    SOCKET_GET_CCG_LIST 
+    SOCKET_GET_CCG_LIST, 
+    SOCKET_SAVE_CCG_FILE
 } from '../../server/constants/SOCKET_IO_DISPATCHERS';
 
 interface IStorageProps {
@@ -59,8 +60,8 @@ class Storage extends React.PureComponent<IStorageProps & Store> {
     loadCcgFile(event: any) {
         if (window.confirm('Are you sure you will load a CasparCG setup?'))
         {
-            console.log('Loading files')
-            window.socketIoClient.emit(SOCKET_LOAD_SNAPSHOT, event.target.textContent)
+            console.log('Setting default CasparCG file')
+            window.socketIoClient.emit(SOCKET_SAVE_CCG_FILE, event.target.textContent)
         }
         this.handleClose()
     }
@@ -69,12 +70,11 @@ class Storage extends React.PureComponent<IStorageProps & Store> {
     ListSnapshotFiles() {
         window.socketIoClient.emit(SOCKET_GET_SNAPSHOT_LIST)
         const listItems = window.snapshotFileList.map((file: string, index: number) => {
-        return (
-            <li key={index} onClick={this.loadFile} className="item">
-            {file}
-       </li>)
-        }
-        );
+            return (
+                <li key={index} onClick={this.loadFile} className="item">
+                {file}
+                </li>)
+            });
         return (
           <ul className="storage-list">
             {listItems}
@@ -85,17 +85,17 @@ class Storage extends React.PureComponent<IStorageProps & Store> {
     ListCcgFiles() {
         window.socketIoClient.emit(SOCKET_GET_CCG_LIST)
         const listItems = window.ccgFileList.map((file: string, index: number) => {
+            return (
+                <li key={index} onClick={this.loadCcgFile} className="item">
+                    {file}
+                </li>
+            )
+        })
         return (
-            <li key={index} onClick={this.loadFile} className="item">
-            {file}
-       </li>)
-        }
-        );
-        return (
-          <ul className="storage-list">
-            {listItems}
-            </ul>
-        );
+            <ul className="storage-list">
+              {listItems}
+              </ul>
+        )
     }
 
     render() {
diff --git a/server/MainThreadHandler.ts b/server/MainThreadHandler.ts
index adae73a2..f858d8ce 100644
--- a/server/MainThreadHandler.ts
+++ b/server/MainThreadHandler.ts
@@ -8,7 +8,8 @@ import {
     loadSettings, 
     saveSettings, 
     getSnapShotList,
-    getCcgSettingsList
+    getCcgSettingsList,
+    setCcgDefault
 } from './utils/SettingsStorage'
 import { 
     SOCKET_TOGGLE_PGM, 
@@ -40,7 +41,8 @@ import {
     SOCKET_SET_STORE_FADER,
     SOCKET_SET_STORE_CHANNEL,
     SOCKET_SET_LO_MID,
-    SOCKET_SET_INPUT_OPTION
+    SOCKET_SET_INPUT_OPTION,
+    SOCKET_SAVE_CCG_FILE
  } from './constants/SOCKET_IO_DISPATCHERS'
 import { 
     TOGGLE_PGM, 
@@ -168,6 +170,13 @@ export class MainThreadHandlers {
                 )
             })
         )
+        .on(SOCKET_SAVE_CCG_FILE, (
+            (payload: any) => { 
+                logger.info('Set default CCG File :' + String(payload), {})
+                setCcgDefault(payload)
+                this.updateFullClientStore()
+            })
+        )
         .on(SOCKET_SAVE_SETTINGS, (
             (payload: any) => { 
                 logger.info('Save settings :' + String(payload), {})
diff --git a/server/constants/SOCKET_IO_DISPATCHERS.ts b/server/constants/SOCKET_IO_DISPATCHERS.ts
index 75f1d7b1..4a2a7b81 100644
--- a/server/constants/SOCKET_IO_DISPATCHERS.ts
+++ b/server/constants/SOCKET_IO_DISPATCHERS.ts
@@ -32,6 +32,7 @@ export const SOCKET_GET_CCG_LIST = 'getCcgList'
 export const SOCKET_RETURN_CCG_LIST = 'returnCcgList'
 export const SOCKET_LOAD_SNAPSHOT = 'loadSnapshot'
 export const SOCKET_SAVE_SNAPSHOT = 'saveSnapshot'
+export const SOCKET_SAVE_CCG_FILE = 'saveCcgFile'
 
 // Store updates:
 export const SOCKET_SET_FULL_STORE = 'setFullStore'
diff --git a/server/utils/SettingsStorage.ts b/server/utils/SettingsStorage.ts
index ed5a1469..b7ee4ae5 100644
--- a/server/utils/SettingsStorage.ts
+++ b/server/utils/SettingsStorage.ts
@@ -104,9 +104,31 @@ export const getSnapShotList = () => {
 
 export const getCcgSettingsList = () => {
     const files = fs.readdirSync(path.resolve('storage')).filter((file: string) => { 
-        if (file.includes('.ccg')) {
+        if (file.includes('.ccg') && file !== 'default-casparcg.ccg') {
             return true
         }
     })
     return files
 }
+
+export const setCcgDefault = (fileName: string) => {
+    let data: any
+    try {
+        data =  fs.readFileSync(path.join('storage', fileName))
+    }
+    catch (error) {
+        logger.error('Couldn´t read ' + fileName + ' file', {})
+        return
+    }
+    
+    const defaultFile = path.join('storage', 'default-casparcg.ccg')
+    fs.writeFile(defaultFile, data, 'utf8', (error: any)=>{
+        if (error) {
+            logger.error("Error setting default CasparCG setting" + String(error), {})
+        } else {
+            logger.info('CasparCG' + fileName + ' Saved as default CasparCG', {})
+        }
+    });
+
+
+}