diff --git a/storages.js b/storages.js
index 14555c2..f4803cf 100644
--- a/storages.js
+++ b/storages.js
@@ -1,11 +1,13 @@
 define(function(require) {
 	return {
 		"storages": [
+			"azure",
 			"couchdb",
 			"custom_s3",
 			"dropbox",
 			"google_drive",
 			"http",
+			"onedrive",
 			"s3"
 		]
 	};
diff --git a/submodules/azure/azure.js b/submodules/azure/azure.js
new file mode 100644
index 0000000..87ee139
--- /dev/null
+++ b/submodules/azure/azure.js
@@ -0,0 +1,48 @@
+define(function(require){
+	var $ = require('jquery');
+
+	const CONFIG = {
+		submoduleName: 'azure',
+		i18n: [ 'en-US' ]
+	};
+
+	var app = {
+		requests: {},
+
+		subscribe: {
+			'storage.fetchStorages': 'defineStorageAzure'
+		},
+
+		defineStorageAzure: function(args) {
+			var self = this,
+				storage_nodes = args.storages;
+
+			var methods = {
+				getLogo: function () {
+					return self.getTemplate({
+						name: 'logo',
+						submodule: CONFIG.submoduleName,
+						data: {}
+					});
+				},
+
+				getFormElements: function (storageData) {
+					return self.getTemplate({
+						name: 'formElements',
+						submodule: CONFIG.submoduleName,
+						data: storageData
+					});
+				}
+			};
+
+			$.extend(true, storage_nodes, {
+					'azure': methods
+				}
+			);
+
+			args.callback && args.callback(CONFIG)
+		}
+	};
+
+	return app;
+});
diff --git a/submodules/azure/i18n/en-US.json b/submodules/azure/i18n/en-US.json
new file mode 100644
index 0000000..2976b6a
--- /dev/null
+++ b/submodules/azure/i18n/en-US.json
@@ -0,0 +1,12 @@
+{
+	"storage": {
+		"submodules": {
+			"azure": {
+				"nameLabel": "Name",
+				"accountLabel": "Account",
+				"containerLabel": "Container",
+				"keyLabel": "API Key"
+			}
+		}
+	}
+}
diff --git a/submodules/azure/img/logo.png b/submodules/azure/img/logo.png
new file mode 100644
index 0000000..f118801
Binary files /dev/null and b/submodules/azure/img/logo.png differ
diff --git a/submodules/azure/views/formElements.html b/submodules/azure/views/formElements.html
new file mode 100644
index 0000000..ecf715c
--- /dev/null
+++ b/submodules/azure/views/formElements.html
@@ -0,0 +1,27 @@
+<h3 class="storage-type-label">Azure Object Storage</h3>
+<hr />
+<input type="hidden" name="handler" value="azure"/>
+<label class="control-group">
+	<span class="control-label">{{ @root.i18n.storage.submodules.azure.nameLabel }}</span>
+	<div class="controls">
+		<input type="text" value="{{name}}" name="name">
+	</div>
+</label>
+<label class="control-group">
+	<span class="control-label">{{ @root.i18n.storage.submodules.azure.accountLabel }}</span>
+	<div class="controls">
+		<input type="text" value="{{settings.account}}" name="settings.account" placeholder="">
+	</div>
+</label>
+<label class="control-group">
+	<span class="control-label">{{ @root.i18n.storage.submodules.azure.containerLabel }}</span>
+	<div class="controls">
+		<input type="text" value="{{settings.container}}" name="settings.container" minlength="6">
+	</div>
+</label>
+<label class="control-group">
+	<span class="control-label">{{ @root.i18n.storage.submodules.azure.keyLabel }}</span>
+	<div class="controls">
+		<input type="text" value="{{settings.key}}" name="settings.key">
+	</div>
+</label>
diff --git a/submodules/azure/views/logo.html b/submodules/azure/views/logo.html
new file mode 100644
index 0000000..90da338
--- /dev/null
+++ b/submodules/azure/views/logo.html
@@ -0,0 +1 @@
+<img src="/apps/storage/submodules/azure/img/logo.png" alt="azure" />
diff --git a/submodules/custom_s3/i18n/en-US.json b/submodules/custom_s3/i18n/en-US.json
index 4c22635..1eb2920 100644
--- a/submodules/custom_s3/i18n/en-US.json
+++ b/submodules/custom_s3/i18n/en-US.json
@@ -4,6 +4,10 @@
 			"custom_s3": {
 				"nameLabel": "Name",
 				"bucketLabel": "Bucket",
+				"hostLabel": "Host",
+				"portLabel": "Port",
+				"regionLabel": "Region",
+				"schemeLabel": "Scheme",
 				"keyLabel": "Key",
 				"secretLabel": "Secret"
 			}
diff --git a/submodules/custom_s3/views/formElements.html b/submodules/custom_s3/views/formElements.html
index 4486ade..df3f442 100644
--- a/submodules/custom_s3/views/formElements.html
+++ b/submodules/custom_s3/views/formElements.html
@@ -2,43 +2,49 @@
 <hr />
 <input type="hidden" name="handler" value="s3"/>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storage.submodules.s3.nameLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.custom_s3.nameLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{name}}" name="name">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storage.submodules.s3.bucketLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.custom_s3.bucketLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.bucket}}" name="settings.bucket" minlength="6">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storage.submodules.s3.hostLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.custom_s3.hostLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.host}}" name="settings.host" placeholder="us-east-1.telnyxcloudstorage.com">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storage.submodules.s3.portLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.custom_s3.regionLabel }}</span>
+	<div class="controls">
+		<input type="text" value="{{settings.region}}" name="settings.region" placeholder="us-east">
+	</div>
+</label>
+<label class="control-group">
+	<span class="control-label">{{ @root.i18n.storage.submodules.custom_s3.portLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.port}}" name="settings.port" placeholder="443">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storage.submodules.s3.schemeLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.custom_s3.schemeLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.scheme}}" name="settings.scheme" placeholder="https">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storage.submodules.s3.keyLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.custom_s3.keyLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.key}}" name="settings.key">
 	</div>
 </label>
 <label class="control-group">
-	<span class="control-label">{{ @root.i18n.storage.submodules.s3.secretLabel }}</span>
+	<span class="control-label">{{ @root.i18n.storage.submodules.custom_s3.secretLabel }}</span>
 	<div class="controls">
 		<input type="text" value="{{settings.secret}}" name="settings.secret">
 	</div>
diff --git a/submodules/onedrive/i18n/en-US.json b/submodules/onedrive/i18n/en-US.json
new file mode 100644
index 0000000..dca383f
--- /dev/null
+++ b/submodules/onedrive/i18n/en-US.json
@@ -0,0 +1,10 @@
+{
+	"storage": {
+		"submodules": {
+			"onedrive": {
+				"nameLabel": "Name",
+				"docIDLabel": "OAuth Document ID"
+			}
+		}
+	}
+}
diff --git a/submodules/onedrive/img/logo.png b/submodules/onedrive/img/logo.png
new file mode 100644
index 0000000..a0f34f6
Binary files /dev/null and b/submodules/onedrive/img/logo.png differ
diff --git a/submodules/onedrive/onedrive.js b/submodules/onedrive/onedrive.js
new file mode 100644
index 0000000..b16e152
--- /dev/null
+++ b/submodules/onedrive/onedrive.js
@@ -0,0 +1,48 @@
+define(function(require){
+	var $ = require('jquery');
+
+	const CONFIG = {
+		submoduleName: 'onedrive',
+		i18n: [ 'en-US' ]
+	};
+
+	var app = {
+		requests: {},
+
+		subscribe: {
+			'storage.fetchStorages': 'defineStorageOneDrive'
+		},
+
+		defineStorageOneDrive: function(args) {
+			var self = this,
+				storage_nodes = args.storages;
+
+			var methods = {
+				getLogo: function () {
+					return self.getTemplate({
+						name: 'logo',
+						submodule: CONFIG.submoduleName,
+						data: {}
+					});
+				},
+
+				getFormElements: function (storageData) {
+					return self.getTemplate({
+						name: 'formElements',
+						submodule: CONFIG.submoduleName,
+						data: storageData
+					});
+				}
+			};
+
+			$.extend(true, storage_nodes, {
+					'onedrive': methods
+				}
+			);
+
+			args.callback && args.callback(CONFIG)
+		}
+	};
+
+	return app;
+});
diff --git a/submodules/onedrive/views/formElements.html b/submodules/onedrive/views/formElements.html
new file mode 100644
index 0000000..057f9c9
--- /dev/null
+++ b/submodules/onedrive/views/formElements.html
@@ -0,0 +1,16 @@
+<h3 class="storage-type-label">OneDrive</h3>
+<hr />
+<h5>Note: this storage endpoint requires a Microsoft OAuth connection to be already setup.</h5>
+<input type="hidden" name="handler" value="onedrive"/>
+<label class="control-group">
+	<span class="control-label">{{ @root.i18n.storage.submodules.onedrive.nameLabel }}</span>
+	<div class="controls">
+		<input type="text" value="{{name}}" name="name">
+	</div>
+</label>
+<label class="control-group">
+	<span class="control-label">{{ @root.i18n.storage.submodules.onedrive.docIDLabel }}</span>
+	<div class="controls">
+		<input type="text" value="{{settings.oauth_doc_id}}" name="settings.oauth_doc_id" placeholder="Document ID from the system_auth DB">
+	</div>
+</label>
diff --git a/submodules/onedrive/views/logo.html b/submodules/onedrive/views/logo.html
new file mode 100644
index 0000000..3e9468d
--- /dev/null
+++ b/submodules/onedrive/views/logo.html
@@ -0,0 +1 @@
+<img src="/apps/storage/submodules/onedrive/img/logo.png" alt="onedrive" />
diff --git a/submodules/s3/i18n/en-US.json b/submodules/s3/i18n/en-US.json
index af78d30..4f10457 100644
--- a/submodules/s3/i18n/en-US.json
+++ b/submodules/s3/i18n/en-US.json
@@ -3,9 +3,6 @@
 		"submodules": {
 			"s3": {
 				"nameLabel": "Name",
-				"hostLabel": "Host",
-				"portLabel": "Port",
-				"schemeLabel": "Scheme",
 				"bucketLabel": "Bucket",
 				"keyLabel": "Key",
 				"secretLabel": "Secret"