From e36c3ca8418648224b54ef1c37d719468677be22 Mon Sep 17 00:00:00 2001
From: nikitozzzzzzz <nsinelnikov.work@gmail.com>
Date: Mon, 11 Dec 2017 09:53:38 +0200
Subject: [PATCH] - settings optimization;

---
 includes/admin/class-admin.php                |  81 ++---
 includes/admin/core/class-admin-columns.php   |  26 +-
 .../admin/core/class-admin-forms-settings.php |  48 +++
 includes/admin/core/class-admin-forms.php     |  76 ++---
 includes/admin/core/class-admin-menu.php      |   8 +-
 includes/admin/core/class-admin-metabox.php   |   4 +-
 includes/admin/core/class-admin-settings.php  | 295 +++++-------------
 .../core/list-tables/emails-list-table.php    |   4 +-
 includes/admin/core/packages/2.0-beta1.php    |  80 ++---
 includes/class-config.php                     |   2 +-
 includes/class-functions.php                  |  21 +-
 includes/class-init.php                       |  27 ++
 includes/core/class-access.php                |  32 +-
 includes/core/class-account.php               |   6 +-
 includes/core/class-builtin.php               |  12 +-
 includes/core/class-common.php                |   2 +-
 includes/core/class-enqueue.php               |   4 +-
 includes/core/class-fields.php                |   8 +-
 includes/core/class-files.php                 |   8 +-
 includes/core/class-form.php                  |   6 +-
 includes/core/class-mail.php                  |  12 +-
 includes/core/class-members.php               |   2 +-
 includes/core/class-options.php               |  94 ++++++
 includes/core/class-permalinks.php            |  18 +-
 includes/core/class-plugin-updater.php        |   2 +-
 includes/core/class-profile.php               |  12 +-
 includes/core/class-rewrite.php               |  10 +-
 includes/core/class-tracking.php              |   2 +-
 includes/core/class-user.php                  |  10 +-
 includes/core/um-actions-account.php          |   6 +-
 includes/core/um-actions-form.php             |  12 +-
 includes/core/um-actions-login.php            |   2 +-
 includes/core/um-actions-password.php         |  18 +-
 includes/core/um-actions-profile.php          |  20 +-
 includes/core/um-actions-register.php         |   7 +-
 includes/core/um-actions-save-profile.php     |   2 +-
 includes/core/um-actions-wpadmin.php          |  94 ------
 includes/core/um-filters-account.php          |   2 +-
 includes/core/um-filters-avatars.php          |  14 +-
 includes/core/um-filters-fields.php           |   8 +-
 includes/core/um-filters-language.php         |   2 +-
 includes/core/um-filters-login.php            |   2 +-
 includes/core/um-filters-members.php          |   4 +-
 includes/core/um-filters-profile.php          |   2 +-
 includes/core/um-filters-user.php             |   4 +-
 includes/core/um-navmenu.php                  |   2 +-
 includes/lib/upload/um-image-upload.php       |   2 +-
 includes/um-short-functions.php               |  36 +--
 templates/account.php                         |   8 +-
 templates/members-grid.php                    |   8 +-
 uninstall.php                                 |   4 +-
 51 files changed, 540 insertions(+), 631 deletions(-)
 create mode 100644 includes/admin/core/class-admin-forms-settings.php
 create mode 100644 includes/core/class-options.php

diff --git a/includes/admin/class-admin.php b/includes/admin/class-admin.php
index 5c9dfacf..93533b09 100644
--- a/includes/admin/class-admin.php
+++ b/includes/admin/class-admin.php
@@ -6,58 +6,59 @@ if ( ! defined( 'ABSPATH' ) ) exit;
 
 if ( ! class_exists( 'Admin' ) ) {
 
-    class Admin {
-        var $templates_path;
+	class Admin {
+		var $templates_path;
 
-        function __construct() {
-            $this->templates_path = um_path . 'includes/admin/templates/';
+		/**
+		 * Admin constructor.
+		 */
+		function __construct() {
+			$this->templates_path = um_path . 'includes/admin/templates/';
 
-            add_action( 'admin_init', array( &$this, 'admin_init' ), 0 );
+			add_action( 'admin_init', array( &$this, 'admin_init' ), 0 );
 
-	        add_action( 'admin_notices', array( $this, 'check_wrong_install_folder' ), 3 );
-
-        }
+			add_action( 'admin_notices', array( $this, 'check_wrong_install_folder' ), 3 );
+		}
 
 
+		/**
+		 * Check if plugin is installed with correct folder
+		 */
+		function check_wrong_install_folder() {
+			$invalid_folder = false;
 
-        function check_wrong_install_folder() {
-	        $invalid_folder = false;
+			$slug_array = explode( '/', um_plugin );
+			if ( $slug_array[0] != 'ultimate-member' )
+				$invalid_folder = true;
 
-	        $slug_array = explode( '/', um_plugin );
-	        if ( $slug_array[0] != 'ultimate-member' )
-		        $invalid_folder = true;
+			if ( $invalid_folder ) { ?>
 
-	        if ( $invalid_folder ) { ?>
+				<div class="error">
+					<p>
+						<?php printf( __( 'You have installed <strong>%s</strong> with wrong folder name. Correct folder name is <strong>"ultimate-member"</strong>.', 'ultimate-member' ), ultimatemember_plugin_name ) ?>
+					</p>
+				</div>
 
-		        <div class="error">
-			        <p>
-				        <?php printf( __( 'You have installed <strong>%s</strong> with wrong folder name. Correct folder name is <strong>"ultimate-member"</strong>.', 'ultimate-member' ), ultimatemember_plugin_name ) ?>
-			        </p>
-		        </div>
-
-	        <?php }
-        }
+			<?php }
+		}
 
 
+		/**
+		 * Init admin action/filters + request handlers
+		 */
+		function admin_init() {
+			require_once 'core/um-admin-actions-user.php';
+			require_once 'core/um-admin-actions-modal.php';
+			require_once 'core/um-admin-actions.php';
 
-        /**
-         * Init admin action/filters + request handlers
-         */
-        function admin_init() {
-            require_once 'core/um-admin-actions-user.php';
-            require_once 'core/um-admin-actions-modal.php';
-            require_once 'core/um-admin-actions.php';
+			require_once 'core/um-admin-filters-fields.php';
 
-            require_once 'core/um-admin-filters-fields.php';
-
-            if ( is_admin() && current_user_can('manage_options') &&
-                ! empty( $_REQUEST['um_adm_action'] ) ) {
-                do_action( "um_admin_do_action__", $_REQUEST['um_adm_action'] );
-                do_action( "um_admin_do_action__{$_REQUEST['um_adm_action']}", $_REQUEST['um_adm_action'] );
-            }
-
-        }
-
-    }
+			if ( is_admin() && current_user_can('manage_options') &&
+				! empty( $_REQUEST['um_adm_action'] ) ) {
+				do_action( "um_admin_do_action__", $_REQUEST['um_adm_action'] );
+				do_action( "um_admin_do_action__{$_REQUEST['um_adm_action']}", $_REQUEST['um_adm_action'] );
+			}
+		}
 
+	}
 }
\ No newline at end of file
diff --git a/includes/admin/core/class-admin-columns.php b/includes/admin/core/class-admin-columns.php
index 8d281747..32af20c6 100644
--- a/includes/admin/core/class-admin-columns.php
+++ b/includes/admin/core/class-admin-columns.php
@@ -119,25 +119,27 @@ if ( ! class_exists( 'Admin_Columns' ) ) {
 
         }
 
+
 		/**
 		* Add a post display state for special UM pages in the page list table.
 		*
-		* @param array   $post_states An array of post display states.
-		* @param WP_Post $post The current post object.
+		* @param array $post_states An array of post display states.
+		* @param \WP_Post $post The current post object.
+		*
+		* @return mixed
 		*/
+		public function add_display_post_states( $post_states, $post ) {
 
-	    public function add_display_post_states( $post_states, $post ) {
+			foreach ( UM()->config()->core_pages as $page_key => $page_value ) {
+				$page_id = UM()->options()->get( apply_filters( 'um_core_page_id_filter', 'core_' . $page_key ) );
 
-		    foreach ( UM()->config()->core_pages as $page_key => $page_value ) {
+				if ( $page_id == $post->ID ) {
+					$post_states['um_core_page_' . $page_key] = sprintf( 'UM %s', $page_value['title'] );
+				}
+			}
 
-			    $page_id = UM()->um_get_option( apply_filters( 'um_core_page_id_filter', 'core_' . $page_key ) );
-
-			    if ( $page_id == $post->ID )
-				    $post_states['um_core_page_' . $page_key] = sprintf('UM %s', $page_value['title'] ) ;
-		    }
-
-		    return $post_states;
-	    }
+			return $post_states;
+		}
 
     }
 }
\ No newline at end of file
diff --git a/includes/admin/core/class-admin-forms-settings.php b/includes/admin/core/class-admin-forms-settings.php
new file mode 100644
index 00000000..18db32e0
--- /dev/null
+++ b/includes/admin/core/class-admin-forms-settings.php
@@ -0,0 +1,48 @@
+<?php
+namespace um\admin\core;
+
+// Exit if accessed directly.
+if ( ! defined( 'ABSPATH' ) ) exit;
+
+if ( ! class_exists( 'Admin_Forms_Settings' ) ) {
+	class Admin_Forms_Settings extends Admin_Forms {
+
+		/**
+		 * Admin_Forms constructor.
+		 * @param bool $form_data
+		 */
+		function __construct( $form_data = false ) {
+
+			parent::__construct( $form_data );
+
+		}
+
+
+		/**
+		 * Get field value
+		 *
+		 * @param array $field_data
+		 * @return string|array
+		 */
+		function get_field_value( $field_data ) {
+			$default = isset( $field_data['default'] ) ? $field_data['default'] : UM()->options()->get_default( $field_data['id'] );
+
+			if ( $field_data['type'] == 'checkbox' || $field_data['type'] == 'multi_checkbox' ) {
+				if ( isset( $field_data['value'] ) ) {
+					return $field_data['value'];
+				} else {
+					$value = UM()->options()->get( $field_data['id'] );
+					return '' !== $value ? $value : $default;
+				}
+			} else {
+				if ( isset( $field_data['value'] ) ) {
+					return $field_data['value'];
+				} else {
+					$value = UM()->options()->get( $field_data['id'] );
+					return isset( $value ) ? $value : $default;
+				}
+			}
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/includes/admin/core/class-admin-forms.php b/includes/admin/core/class-admin-forms.php
index eff767ed..7221e616 100644
--- a/includes/admin/core/class-admin-forms.php
+++ b/includes/admin/core/class-admin-forms.php
@@ -281,8 +281,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
             $name_attr = ' name="' . $name . '" ';
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $value = $this->get_field_value( $field_data );
             $value_attr = ' value="' . $value . '" ';
 
             $html = "<input type=\"hidden\" $id_attr $class_attr $name_attr $data_attr $value_attr />";
@@ -318,8 +317,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
             $name_attr = ' name="' . $name . '" ';
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $value = $this->get_field_value( $field_data );
             $value_attr = ' value="' . $value . '" ';
 
             $html = "<input type=\"text\" $id_attr $class_attr $name_attr $data_attr $value_attr $placeholder_attr />";
@@ -356,8 +354,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
             $name_attr = ' name="' . $name . '" ';
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $value = $this->get_field_value( $field_data );
             $value_attr = ' value="' . $value . '" ';
 
             $html = "<input type=\"text\" $id_attr $class_attr $name_attr $data_attr $value_attr $placeholder_attr />";
@@ -378,8 +375,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
             $name_attr = ' name="' . $name . '" ';
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $value = $this->get_field_value( $field_data );
             $value_attr = ' value="' . $value . '" ';
 
             $html = '<a href="#" class="button" data-modal="UM_fonticons" data-modal-size="normal" data-dynamic-content="um_admin_fonticon_selector" data-arg1="" data-arg2="" data-back="">' . __( 'Choose Icon', 'ultimate-member' ) . '</a>
@@ -432,8 +428,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
             $name_attr = ' name="' . $name . '" ';
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $value = $this->get_field_value( $field_data );
             $value_attr = ' value="' . $value . '" ';
 
             $html = "<input type=\"date\" $id_attr $class_attr $name_attr $data_attr $value_attr $placeholder_attr />";
@@ -515,8 +510,8 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
             $name_attr = ' name="' . $name . '" ';
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $value = $this->get_field_value( $field_data );
+
             $html = "<textarea $id_attr $class_attr $name_attr $data_attr $rows>$value</textarea>";
 
             return $html;
@@ -545,8 +540,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = $field_data['id'];
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $value = $this->get_field_value( $field_data );
 
             ob_start();
             wp_editor( $value,
@@ -593,11 +587,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
             $name_attr = ' name="' . $name . '" ';
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = ( isset( $field_data['value'] ) && '' !== $field_data['value'] ) ? $field_data['value'] : $default;
-            /*$value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
-            $value = ! empty( $field_data['value'] ) ? $field_data['value'] : 0;
-            */
+            $value = $this->get_field_value( $field_data );
 
             $html = "<input type=\"hidden\" $id_attr_hidden $name_attr value=\"0\" />
             <input type=\"checkbox\" $id_attr $class_attr $name_attr $data_attr " . checked( $value, true, false ) . " value=\"1\" />";
@@ -632,11 +622,11 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
 
             $name = $field_data['id'];
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
+            $hidden_name_attr = ' name="' . $name . '" ';
             $name = $name . ( ! empty( $field_data['multi'] ) ? '[]' : '' );
             $name_attr = ' name="' . $name . '" ';
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $value = $this->get_field_value( $field_data );
 
             $options = '';
             foreach ( $field_data['options'] as $key=>$option ) {
@@ -651,7 +641,11 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
                 }
             }
 
-            $html = "<select $multiple $id_attr $name_attr $class_attr $data_attr>$options</select>";
+            $hidden = '';
+            if ( ! empty( $multiple ) ) {
+                $hidden = "<input type=\"hidden\" $hidden_name_attr value=\"\" />";
+            }
+            $html = "$hidden<select $multiple $id_attr $name_attr $class_attr $data_attr>$options</select>";
 
             return $html;
         }
@@ -683,8 +677,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = "{$name}[]";
             $name_attr = ' name="' . $name . '" ';
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $values = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $values = $this->get_field_value( $field_data );
 
             $options = '';
             foreach ( $field_data['options'] as $key=>$option ) {
@@ -746,8 +739,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = $field_data['id'];
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : array();
-            $values = ( isset( $field_data['value'] ) && '' !== $field_data['value'] ) ? $field_data['value'] : $default;
+            $values = $this->get_field_value( $field_data );
 
             $i = 0;
             $html = '';
@@ -804,10 +796,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = "{$name}[]";
             $name_attr = ' name="' . $name . '" ';
 
-            //$values = ! empty( $field_data['value'] ) ? $field_data['value'] : ( ! empty( $field_data['default'] ) ? $field_data['default'] : '' );
-
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $values = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $values = $this->get_field_value( $field_data );
 
             $html = "<input type=\"text\" class=\"um-hidden-multi-text\" $data_attr />";
             $html .= "<ul class=\"um-multi-text-list\" $data_attr>";
@@ -865,8 +854,8 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
 
             $name = $field_data['id'];
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = ! empty( $field_data['value'] ) ? $field_data['value'] : $default;
+
+            $value = $this->get_field_value( $field_data );
 
             $upload_frame_title = ! empty( $field_data['upload_frame_title'] ) ? $field_data['upload_frame_title'] : __( 'Select media', 'ultimate-member' );
 
@@ -919,8 +908,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = $field_data['id'];
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $value = $this->get_field_value( $field_data );
 
             ob_start(); ?>
 
@@ -975,8 +963,7 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             $name = ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] . '[' . $name . ']' : $name;
             $name_attr = ' name="' . $name . '" ';
 
-            $default = isset( $field_data['default'] ) ? $field_data['default'] : '';
-            $value = isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            $value = $this->get_field_value( $field_data );
             $value_attr = ' value="' . $value . '" ';
 
             $html = "<input type=\"button\" $id_attr $class_attr $name_attr $data_attr $value_attr /><div class='clear'></div><div class='um_setting_ajax_button_response'></div>";
@@ -984,5 +971,22 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
             return $html;
         }
 
+
+        /**
+         * Get field value
+         *
+         * @param array $field_data
+         * @return string|array
+         */
+        function get_field_value( $field_data ) {
+            $default = ( $field_data['type'] == 'multi_checkbox' ) ? array() : '';
+            $default = isset( $field_data['default'] ) ? $field_data['default'] : $default;
+
+            if ( $field_data['type'] == 'checkbox' || $field_data['type'] == 'multi_checkbox' ) {
+                return ( isset( $field_data['value'] ) && '' !== $field_data['value'] ) ? $field_data['value'] : $default;
+            } else {
+                return isset( $field_data['value'] ) ? $field_data['value'] : $default;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/includes/admin/core/class-admin-menu.php b/includes/admin/core/class-admin-menu.php
index 7524c5c7..c4c56fcf 100644
--- a/includes/admin/core/class-admin-menu.php
+++ b/includes/admin/core/class-admin-menu.php
@@ -106,15 +106,15 @@ if ( ! class_exists( 'Admin_Menu' ) ) {
          ***/
         function secondary_menu_items() {
 
-            add_submenu_page( $this->slug, __('Forms', $this->slug), __('Forms', $this->slug), 'manage_options', 'edit.php?post_type=um_form', '', '' );
+            add_submenu_page( $this->slug, __( 'Forms', 'ultimate-member' ), __( 'Forms', 'ultimate-member' ), 'manage_options', 'edit.php?post_type=um_form', '' );
 
             add_submenu_page( $this->slug, __( 'User Roles', 'ultimate-member' ), __( 'User Roles', 'ultimate-member' ), 'manage_options', 'um_roles', array( &$this, 'um_roles_pages' ) );
 
-            if ( um_get_option('members_page' ) || !get_option('um_options') ){
-                add_submenu_page( $this->slug, __('Member Directories', $this->slug), __('Member Directories', $this->slug), 'manage_options', 'edit.php?post_type=um_directory', '', '' );
+            if ( UM()->options()->get( 'members_page' ) ) {
+                add_submenu_page( $this->slug, __( 'Member Directories', 'ultimate-member' ), __( 'Member Directories', 'ultimate-member' ), 'manage_options', 'edit.php?post_type=um_directory', '' );
             }
 
-            do_action('um_extend_admin_menu');
+            do_action( 'um_extend_admin_menu' );
 
         }
 
diff --git a/includes/admin/core/class-admin-metabox.php b/includes/admin/core/class-admin-metabox.php
index 9b731860..3fe2bf4a 100644
--- a/includes/admin/core/class-admin-metabox.php
+++ b/includes/admin/core/class-admin-metabox.php
@@ -99,7 +99,7 @@ if ( ! class_exists( 'Admin_Metabox' ) ) {
             }
 
             //restrict content metabox
-            $post_types = um_get_option( 'restricted_access_post_metabox' );
+            $post_types = UM()->options()->get( 'restricted_access_post_metabox' );
             if ( ! empty( $post_types[ $current_screen->id ] ) ) {
 
                 $hide_metabox = apply_filters( 'um_restrict_content_hide_metabox', false );
@@ -154,7 +154,7 @@ if ( ! class_exists( 'Admin_Metabox' ) ) {
         function add_taxonomy_metabox() {
             //restrict content metabox
             $all_taxonomies = get_taxonomies( array( 'public' => true ) );
-            $tax_types = um_get_option( 'restricted_access_taxonomy_metabox' );
+            $tax_types = UM()->options()->get( 'restricted_access_taxonomy_metabox' );
             $exclude_taxonomies = UM()->excluded_taxonomies();
 
             foreach ( $all_taxonomies as $key => $taxonomy ) {
diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php
index 9bbda965..c50d33f2 100644
--- a/includes/admin/core/class-admin-settings.php
+++ b/includes/admin/core/class-admin-settings.php
@@ -81,8 +81,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                         'label'    		=> sprintf( __( '%s page', 'ultimate-member' ), $page_title ),
                         'placeholder' 	=> __('Add page ID','ultimate-member'),
                         'compiler' 		=> true,
-                        'value' 		=> UM()->um_get_option( $page_id ),
-                        'default' 		=> UM()->um_get_default( $page_id ),
                         'size'          => 'small'
                     );
                 } else {
@@ -93,8 +91,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                         'options' 		=> UM()->query()->wp_pages(),
                         'placeholder' 	=> __('Choose a page...','ultimate-member'),
                         'compiler' 		=> true,
-                        'value' 		=> UM()->um_get_option( $page_id ),
-                        'default' 		=> UM()->um_get_default( $page_id ),
                         'size'          => 'small'
                     );
                 }
@@ -107,8 +103,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                     'id'       		=> 'profile_menu',
                     'type'     		=> 'checkbox',
                     'label'    		=> __('Enable profile menu','ultimate-member'),
-                    'value' 		=> UM()->um_get_option( 'profile_menu' ),
-                    'default' 		=> UM()->um_get_default( 'profile_menu' ),
                 )
             );
 
@@ -116,16 +110,12 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
 
             foreach( $tabs as $id => $tab ) {
 
-                $profile_tab_roles = UM()->um_get_option( 'profile_tab_' . $id . '_roles' );
-
                 $appearances_profile_menu_fields = array_merge( $appearances_profile_menu_fields, array(
                     array(
                         'id'       		=> 'profile_tab_' . $id,
                         'type'     		=> 'checkbox',
                         'label'    		=> sprintf(__('%s Tab','ultimate-member'), $tab ),
                         'conditional'		=> array( 'profile_menu', '=', 1 ),
-                        'value' 		=> UM()->um_get_option( 'profile_tab_' . $id ),
-                        'default' 		=> UM()->um_get_default( 'profile_tab_' . $id ),
                     ),
                     array(
                         'id'       		=> 'profile_tab_' . $id . '_privacy',
@@ -134,8 +124,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                         'tooltip' 	=> __( 'Select which users can view this tab.','ultimate-member' ),
                         'options' 		=> UM()->profile()->tabs_privacy(),
                         'conditional'		=> array( 'profile_tab_' . $id, '=', 1 ),
-                        'value' 		=> UM()->um_get_option( 'profile_tab_' . $id . '_privacy' ),
-                        'default' 		=> UM()->um_get_default( 'profile_tab_' . $id . '_privacy' ),
                         'size'          => 'small'
                     ),
                     array(
@@ -147,8 +135,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                         'options' 		=> UM()->roles()->get_roles(),
                         'placeholder' 	=> __( 'Choose user roles...','ultimate-member' ),
                         'conditional'		=> array( 'profile_tab_' . $id . '_privacy', '=', 4 ),
-                        'value' 		=> ! empty( $profile_tab_roles ) ? $profile_tab_roles : array(),
-                        'default' 		=> UM()->um_get_default( 'profile_tab_' . $id . '_roles' ),
                         'size'          => 'small'
                     )
                 ) );
@@ -162,8 +148,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                     'tooltip' 	=> __( 'This will be the default tab on user profile page','ultimate-member' ),
                     'options' 		=> UM()->profile()->tabs_enabled(),
                     'conditional'	=> array( 'profile_menu', '=', 1 ),
-                    'value' 		=> UM()->um_get_option( 'profile_menu_default_tab' ),
-                    'default' 		=> UM()->um_get_default( 'profile_menu_default_tab' ),
                     'size'          => 'small'
                 ),
                 array(
@@ -171,8 +155,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                     'type'     		=> 'checkbox',
                     'label'    		=> __('Enable menu icons in desktop view','ultimate-member'),
                     'conditional'		=> array( 'profile_menu', '=', 1 ),
-                    'value' 		=> UM()->um_get_option( 'profile_menu_icons' ),
-                    'default' 		=> UM()->um_get_default( 'profile_menu_icons' ),
                 )
             ) );
 
@@ -187,7 +169,7 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
             }
 
             $restricted_access_post_metabox_value = array();
-            if ( $restricted_access_post_metabox = UM()->um_get_option( 'restricted_access_post_metabox' ) ) {
+            if ( $restricted_access_post_metabox = UM()->options()->get( 'restricted_access_post_metabox' ) ) {
                 foreach ( $restricted_access_post_metabox as $key => $value ) {
                     if ( $value )
                         $restricted_access_post_metabox_value[] = $key;
@@ -196,7 +178,7 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
 
 
             $restricted_access_taxonomy_metabox_value = array();
-            if ( $restricted_access_taxonomy_metabox = UM()->um_get_option( 'restricted_access_taxonomy_metabox' ) ) {
+            if ( $restricted_access_taxonomy_metabox = UM()->options()->get( 'restricted_access_taxonomy_metabox' ) ) {
                 foreach ( $restricted_access_taxonomy_metabox as $key => $value ) {
                     if ( $value )
                         $restricted_access_taxonomy_metabox_value[] = $key;
@@ -228,8 +210,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                         'user_id' 			=> __('User ID','ultimate-member'),
                                     ),
                                     'placeholder' 	=> __('Select...','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'permalink_base' ),
-                                    'default' 		=> UM()->um_get_default( 'permalink_base' ),
                                 ),
                                 array(
                                     'id'       		=> 'display_name',
@@ -249,8 +229,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                         'field' 			=> __('Custom field(s)','ultimate-member'),
                                     ),
                                     'placeholder' 	=> __('Select...'),
-                                    'value' 		=> UM()->um_get_option( 'display_name' ),
-                                    'default' 		=> UM()->um_get_default( 'display_name' ),
                                 ),
                                 array(
                                     'id'       		=> 'display_name_field',
@@ -258,32 +236,24 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'   		=> __( 'Display Name Custom Field(s)','ultimate-member' ),
                                     'tooltip' 	=> __('Specify the custom field meta key or custom fields seperated by comma that you want to use to display users name on the frontend of your site','ultimate-member'),
                                     'conditional'   => array( 'display_name', '=', 'field' ),
-                                    'value' 		=> UM()->um_get_option( 'display_name_field' ),
-                                    'default' 		=> UM()->um_get_default( 'display_name_field' ),
                                 ),
                                 array(
                                     'id'       		=> 'author_redirect',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Automatically redirect author page to their profile?','ultimate-member'),
                                     'tooltip' 	=> __('If enabled, author pages will automatically redirect to the user\'s profile page','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'author_redirect' ),
-                                    'default' 		=> UM()->um_get_default( 'author_redirect' ),
                                 ),
                                 array(
                                     'id'       		=> 'members_page',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Enable Members Directory','ultimate-member' ),
                                     'tooltip' 	=> __('Control whether to enable or disable member directories on this site','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'members_page' ),
-                                    'default' 		=> UM()->um_get_default( 'members_page' ),
                                 ),
                                 array(
                                     'id'       		=> 'use_gravatars',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Use Gravatars?','ultimate-member' ),
                                     'tooltip' 	=> __('Do you want to use gravatars instead of the default plugin profile photo (If the user did not upload a custom profile photo / avatar)','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'use_gravatars' ),
-                                    'default' 		=> UM()->um_get_default( 'use_gravatars' ),
                                 ),
                                 array(
                                     'id'       		=> 'use_um_gravatar_default_builtin_image',
@@ -301,8 +271,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                         'blank'			=> __('Blank ( a transparent PNG image )','ultimate-member'),
                                     ),
                                     'conditional'		=> array( 'use_gravatars', '=', 1 ),
-                                    'value' 		=> UM()->um_get_option( 'use_um_gravatar_default_builtin_image' ),
-                                    'default' 		=> UM()->um_get_default( 'use_um_gravatar_default_builtin_image' ),
                                     'size'          => 'medium'
                                 ),
                                 array(
@@ -311,16 +279,12 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'   		=> __( 'Use Default plugin avatar as Gravatar\'s Default avatar','ultimate-member' ),
                                     'tooltip' 	=> __('Do you want to use the plugin default avatar instead of the gravatar default photo (If the user did not upload a custom profile photo / avatar)','ultimate-member'),
                                     'conditional'		=> array( 'use_um_gravatar_default_builtin_image', '=', 'default' ),
-                                    'value' 		=> UM()->um_get_option( 'use_um_gravatar_default_image' ),
-                                    'default' 		=> UM()->um_get_default( 'use_um_gravatar_default_image' ),
                                 ),
                                 array(
                                     'id'       		=> 'reset_require_strongpass',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Require a strong password? (when user resets password only)','ultimate-member' ),
                                     'tooltip' 	=> __('Enable or disable a strong password rules on password reset and change procedure','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'reset_require_strongpass' ),
-                                    'default' 		=> UM()->um_get_default( 'reset_require_strongpass' ),
                                 )
                             )
                         ),
@@ -332,32 +296,24 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Password Account Tab','ultimate-member' ),
                                     'tooltip' 	=> 'Enable/disable the Password account tab in account page',
-                                    'value' 		=> UM()->um_get_option( 'account_tab_password' ),
-                                    'default' 		=> UM()->um_get_default( 'account_tab_password' ),
                                 ),
                                 array(
                                     'id'       		=> 'account_tab_privacy',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Privacy Account Tab','ultimate-member' ),
                                     'tooltip' 	=> __('Enable/disable the Privacy account tab in account page','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'account_tab_privacy' ),
-                                    'default' 		=> UM()->um_get_default( 'account_tab_privacy' ),
                                 ),
                                 array(
                                     'id'       		=> 'account_tab_notifications',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Notifications Account Tab','ultimate-member' ),
                                     'tooltip' 	=> __('Enable/disable the Notifications account tab in account page','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'account_tab_notifications' ),
-                                    'default' 		=> UM()->um_get_default( 'account_tab_notifications' ),
                                 ),
                                 array(
                                     'id'       		=> 'account_tab_delete',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Delete Account Tab','ultimate-member' ),
                                     'tooltip' 	=> __('Enable/disable the Delete account tab in account page','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'account_tab_delete' ),
-                                    'default' 		=> UM()->um_get_default( 'account_tab_delete' ),
                                 ),
                                 array(
                                     'id'       		=> 'delete_account_text',
@@ -367,16 +323,12 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'args'     		=> array(
                                         'textarea_rows'    => 6
                                     ),
-                                    'value' 		=> UM()->um_get_option( 'delete_account_text' ),
-                                    'default' 		=> UM()->um_get_default( 'delete_account_text' ),
                                 ),
                                 array(
                                     'id'       		=> 'account_name',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Add a First & Last Name fields','ultimate-member' ),
                                     'tooltip' 	=> __('Whether to enable these fields on the user account page by default or hide them.','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'account_name' ),
-                                    'default' 		=> UM()->um_get_default( 'account_name' ),
                                 ),
                                 array(
                                     'id'       		=> 'account_name_disable',
@@ -384,8 +336,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'   		=> __( 'Disable First & Last Name fields','ultimate-member' ),
                                     'tooltip' 	=> __('Whether to allow users changing their first and last name in account page.','ultimate-member'),
                                     'conditional'		=> array( 'account_name', '=', '1' ),
-                                    'value' 		=> UM()->um_get_option( 'account_name_disable' ),
-                                    'default' 		=> UM()->um_get_default( 'account_name_disable' ),
                                 ),
                                 array(
                                     'id'       		=> 'account_name_require',
@@ -393,32 +343,24 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'   		=> __( 'Require First & Last Name','ultimate-member' ),
                                     'tooltip' 	=> __('Require first and last name?','ultimate-member'),
                                     'conditional'		=> array( 'account_name', '=', '1' ),
-                                    'value' 		=> UM()->um_get_option( 'account_name_require' ),
-                                    'default' 		=> UM()->um_get_default( 'account_name_require' ),
                                 ),
                                 array(
                                     'id'       		=> 'account_email',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Allow users to change e-mail','ultimate-member' ),
                                     'tooltip' 	=> __('Whether to allow users changing their email in account page.','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'account_email' ),
-                                    'default' 		=> UM()->um_get_default( 'account_email' ),
                                 ),
                                 array(
                                     'id'       		=> 'account_hide_in_directory',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Allow users to hide their profiles from directory','ultimate-member' ),
                                     'tooltip' 	=> __('Whether to allow users changing their profile visibility from member directory in account page.','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'account_hide_in_directory' ),
-                                    'default' 		=> UM()->um_get_default( 'account_hide_in_directory' ),
                                 ),
                                 array(
                                     'id'       		=> 'account_require_strongpass',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Require a strong password?','ultimate-member' ),
                                     'tooltip' 	=> __('Enable or disable a strong password rules on account page / change password tab','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'account_require_strongpass' ),
-                                    'default' 		=> UM()->um_get_default( 'account_require_strongpass' ),
                                 )
                             )
                         ),
@@ -431,8 +373,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'size'     		=> 'small',
                                     'label'    		=> __( 'Profile Photo Maximum File Size (bytes)', 'ultimate-member' ),
                                     'tooltip' 	   	=> __( 'Sets a maximum size for the uploaded photo', 'ultimate-member' ),
-                                    'value' 		=> UM()->um_get_option( 'profile_photo_max_size' ),
-                                    'default' 		=> UM()->um_get_default( 'profile_photo_max_size' ),
                                 ),
 
                                 array(
@@ -441,8 +381,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'size'     		=> 'small',
                                     'label'    		=> __( 'Cover Photo Maximum File Size (bytes)', 'ultimate-member' ),
                                     'tooltip' 	   	=> __( 'Sets a maximum size for the uploaded cover', 'ultimate-member' ),
-                                    'value' 		=> UM()->um_get_option( 'cover_photo_max_size' ),
-                                    'default' 		=> UM()->um_get_default( 'cover_photo_max_size' ),
                                 ),
                                 array(
                                     'id'       		=> 'photo_thumb_sizes',
@@ -453,8 +391,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'validate' 		=> 'numeric',
                                     'add_text'		=> __('Add New Size','ultimate-member'),
                                     'show_default_number' => 1,
-                                    'value' 		=> UM()->um_get_option( 'photo_thumb_sizes' ),
-                                    'default' 		=> UM()->um_get_default( 'photo_thumb_sizes' ),
                                 ),
                                 array(
                                     'id'       		=> 'cover_thumb_sizes',
@@ -465,8 +401,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'validate' 		=> 'numeric',
                                     'add_text'		=> __('Add New Size','ultimate-member'),
                                     'show_default_number' => 1,
-                                    'value' 		=> UM()->um_get_option( 'cover_thumb_sizes' ),
-                                    'default' 		=> UM()->um_get_default( 'cover_thumb_sizes' ),
                                 ),
 
                                 array(
@@ -475,8 +409,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'size'     		=> 'small',
                                     'label'    		=> __( 'Image Quality','ultimate-member'),
                                     'tooltip' 	   	=> __( 'Quality is used to determine quality of image uploads, and ranges from 0 (worst quality, smaller file) to 100 (best quality, biggest file). The default range is 60.', 'ultimate-member' ),
-                                    'value' 		=> UM()->um_get_option( 'image_compression' ),
-                                    'default' 		=> UM()->um_get_default( 'image_compression' ),
                                 ),
 
                                 array(
@@ -485,8 +417,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'size'     		=> 'small',
                                     'label'    		=> __( 'Image Upload Maximum Width (px)', 'ultimate-member' ),
                                     'tooltip' 	   	=> __( 'Any image upload above this width will be resized to this limit automatically.', 'ultimate-member' ),
-                                    'value' 		=> UM()->um_get_option( 'image_max_width' ),
-                                    'default' 		=> UM()->um_get_default( 'image_max_width' ),
                                 ),
 
                                 array(
@@ -495,8 +425,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'size'     		=> 'small',
                                     'label'    		=> __( 'Cover Photo Minimum Width (px)', 'ultimate-member' ),
                                     'tooltip' 	   	=> __( 'This will be the minimum width for cover photo uploads', 'ultimate-member' ),
-                                    'value' 		=> UM()->um_get_option( 'cover_min_width' ),
-                                    'default' 		=> UM()->um_get_default( 'cover_min_width' ),
                                 ),
                             )
                         )
@@ -517,8 +445,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                         0 		=> 'Site accessible to Everyone',
                                         2 		=> 'Site accessible to Logged In Users'
                                     ),
-                                    'value' 		=> UM()->um_get_option( 'accessible' ),
-                                    'default' 		=> UM()->um_get_default( 'accessible' ),
                                     'size'          => 'medium'
                                 ),
                                 array(
@@ -527,8 +453,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'   		=> __( 'Custom Redirect URL','ultimate-member' ),
                                     'tooltip' 	=> __('A logged out user will be redirected to this url If he is not permitted to access the site','ultimate-member'),
                                     'conditional'		=> array( 'accessible', '=', 2 ),
-                                    'value' 		=> UM()->um_get_option( 'access_redirect' ),
-                                    'default' 		=> UM()->um_get_default( 'access_redirect' ),
                                 ),
                                 array(
                                     'id'       		=> 'access_exclude_uris',
@@ -538,32 +462,24 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'add_text'		=> __('Add New URL','ultimate-member'),
                                     'conditional'		=> array( 'accessible', '=', 2 ),
                                     'show_default_number' => 1,
-                                    'value' 		=> UM()->um_get_option( 'access_exclude_uris' ),
-                                    'default' 		=> UM()->um_get_default( 'access_exclude_uris' ),
                                 ),
                                 array(
                                     'id'       		=> 'home_page_accessible',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Allow Homepage to be accessible','ultimate-member' ),
                                     'conditional'		=> array( 'accessible', '=', 2 ),
-                                    'value' 		=> UM()->um_get_option( 'home_page_accessible' ),
-                                    'default' 		=> UM()->um_get_default( 'home_page_accessible' ),
                                 ),
                                 array(
                                     'id'       		=> 'category_page_accessible',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Allow Category pages to be accessible','ultimate-member' ),
                                     'conditional'		=> array( 'accessible', '=', 2 ),
-                                    'value' 		=> UM()->um_get_option( 'category_page_accessible' ),
-                                    'default' 		=> UM()->um_get_default( 'category_page_accessible' ),
                                 ),
                                 array(
                                     'id'       		=> 'restricted_access_message',
                                     'type'     		=> 'wp_editor',
                                     'label'   		=> __( 'Restricted Access Message','ultimate-member' ),
                                     'tooltip'   => __( 'This is the message shown to users that do not have permission to view the content','ultimate-member' ),
-                                    'value' 		=> UM()->um_get_option( 'restricted_access_message' ),
-                                    'default' 		=> UM()->um_get_default( 'restricted_access_message' ),
                                 ),
                                 array(
                                     'id'       		=> 'restricted_access_post_metabox',
@@ -594,8 +510,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'id'       		=> 'enable_reset_password_limit',
                                     'type'     		=> 'checkbox',
                                     'label'   		=> __( 'Enable the Reset Password Limit?','ultimate-member' ),
-                                    'value' 		=> UM()->um_get_option( 'enable_reset_password_limit' ),
-                                    'default' 		=> UM()->um_get_default( 'enable_reset_password_limit' ),
                                 ),
                                 array(
                                     'id'       		=> 'reset_password_limit_number',
@@ -605,24 +519,18 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'validate'		=> 'numeric',
                                     'conditional'   => array('enable_reset_password_limit','=',1),
                                     'size'          => 'um-small-field',
-                                    'value' 		=> UM()->um_get_option( 'reset_password_limit_number' ),
-                                    'default' 		=> UM()->um_get_default( 'reset_password_limit_number' ),
                                 ),
                                 array(
                                     'id'       		=> 'blocked_emails',
                                     'type'     		=> 'textarea',
                                     'label'    		=> __( 'Blocked Email Addresses','ultimate-member' ),
                                     'tooltip'	=> __('This will block the specified e-mail addresses from being able to sign up or sign in to your site. To block an entire domain, use something like *@domain.com','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'blocked_emails' ),
-                                    'default' 		=> UM()->um_get_default( 'blocked_emails' ),
                                 ),
                                 array(
                                     'id'       		=> 'blocked_words',
                                     'type'     		=> 'textarea',
                                     'label'    		=> __( 'Blacklist Words','ultimate-member' ),
                                     'tooltip'	=> __('This option lets you specify blacklist of words to prevent anyone from signing up with such a word as their username','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'blocked_words' ),
-                                    'default' 		=> UM()->um_get_default( 'blocked_words' ),
                                 )
                             )
                         ),
@@ -636,32 +544,24 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                             'type'          => 'text',
                             'label'         => __( 'Admin E-mail Address', 'ultimate-member' ),
                             'tooltip'   => __( 'e.g. admin@companyname.com','ultimate-member' ),
-                            'value' 		=> UM()->um_get_option( 'admin_email' ),
-                            'default' 		=> UM()->um_get_default( 'admin_email' ),
                         ),
                         array(
                             'id'            => 'mail_from',
                             'type'          => 'text',
                             'label'         => __( 'Mail appears from','ultimate-member' ),
                             'tooltip' 	=> __( 'e.g. Site Name','ultimate-member' ),
-                            'value' 		=> UM()->um_get_option( 'mail_from' ),
-                            'default' 		=> UM()->um_get_default( 'mail_from' ),
                         ),
                         array(
                             'id'            => 'mail_from_addr',
                             'type'          => 'text',
                             'label'         => __( 'Mail appears from address','ultimate-member' ),
                             'tooltip'   => __( 'e.g. admin@companyname.com','ultimate-member' ),
-                            'value' 		=> UM()->um_get_option( 'mail_from_addr' ),
-                            'default' 		=> UM()->um_get_default( 'mail_from_addr' ),
                         ),
                         array(
                             'id'            => 'email_html',
                             'type'          => 'checkbox',
                             'label'         => __( 'Use HTML for E-mails?','ultimate-member' ),
                             'tooltip'   => __('If you enable HTML for e-mails, you can customize the HTML e-mail templates found in <strong>templates/email</strong> folder.','ultimate-member'),
-                            'value' 		=> UM()->um_get_option( 'email_html' ),
-                            'default' 		=> UM()->um_get_default( 'email_html' ),
                         )
                     )
                 ),
@@ -678,7 +578,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'tooltip' 	=> __( 'This will be the default template to output profile','ultimate-member' ),
                                     'default'  		=> um_get_metadefault('profile_template'),
                                     'options' 		=> UM()->shortcodes()->get_templates( 'profile' ),
-                                    'value' 		=> UM()->um_get_option( 'profile_template' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -687,7 +586,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Profile Maximum Width','ultimate-member' ),
                                     'default'  		=> um_get_metadefault('profile_max_width'),
                                     'tooltip' 	=> 'The maximum width this shortcode can take from the page width',
-                                    'value' 		=> UM()->um_get_option( 'profile_max_width' ),
                                     'size'          => 'small'
                                 ),
 
@@ -697,7 +595,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Profile Area Maximum Width','ultimate-member' ),
                                     'default'  		=> um_get_metadefault('profile_area_max_width'),
                                     'tooltip' 	=> __('The maximum width of the profile area inside profile (below profile header)','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'profile_area_max_width' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -711,7 +608,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                         'label' 			=> __('Show with label','ultimate-member'),
                                         'off' 				=> __('Turn off','ultimate-member'),
                                     ),
-                                    'value' 		=> UM()->um_get_option( 'profile_icons' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -720,7 +616,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Profile Primary Button Text','ultimate-member' ),
                                     'default'  		=> um_get_metadefault('profile_primary_btn_word'),
                                     'tooltip' 	=> __('The text that is used for updating profile button','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'profile_primary_btn_word' ),
                                     'size'          => 'medium'
                                 ),
                                 array(
@@ -729,7 +624,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Profile Secondary Button','ultimate-member' ),
                                     'default' 		=> um_get_metadefault('profile_secondary_btn'),
                                     'tooltip' 	=> __('Switch on/off the secondary button display in the form','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'profile_secondary_btn' ),
                                 ),
                                 array(
                                     'id'      		=> 'profile_secondary_btn_word',
@@ -738,7 +632,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'default'  		=> um_get_metadefault('profile_secondary_btn_word'),
                                     'tooltip' 	=> __('The text that is used for cancelling update profile button','ultimate-member'),
                                     'conditional'		=> array( 'profile_secondary_btn', '=', 1 ),
-                                    'value' 		=> UM()->um_get_option( 'profile_secondary_btn_word' ),
                                     'size'          => 'medium'
                                 ),
                                 array(
@@ -750,7 +643,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'default'  			=> array(
                                         'url'		=> um_url . 'assets/img/default_avatar.jpg',
                                     ),
-                                    'value' 		=> UM()->um_get_option( 'default_avatar' ),
                                 ),
                                 array(
                                     'id'      			=> 'default_cover',
@@ -760,7 +652,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    			=> __('Default Cover Photo', 'ultimate-member'),
                                     'tooltip'     	=> __('You can change the default cover photo globally here. Please make sure that the default cover is large enough and respects the ratio you are using for cover photos.', 'ultimate-member'),
                                     'upload_frame_title'=> __('Select Default Cover Photo', 'ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'default_cover' ),
                                 ),
                                 array(
                                     'id'      		=> 'profile_photosize',
@@ -768,7 +659,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Profile Photo Size','ultimate-member' ),
                                     'default'  		=> um_get_metadefault('profile_photosize'),
                                     'tooltip' 	=> __('The global default of profile photo size. This can be overridden by individual form settings','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'profile_photosize' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -777,7 +667,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Profile Cover Photos','ultimate-member' ),
                                     'default' 		=> 1,
                                     'tooltip' 	=> __('Switch on/off the profile cover photos','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'profile_cover_enabled' ),
                                 ),
                                 array(
                                     'id'       		=> 'profile_cover_ratio',
@@ -792,7 +681,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                         '3.2:1' 			=> '3.2:1',
                                     ),
                                     'conditional'		=> array( 'profile_cover_enabled', '=', 1 ),
-                                    'value' 		=> UM()->um_get_option( 'profile_cover_ratio' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -801,7 +689,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Profile Header Meta Text Icon','ultimate-member' ),
                                     'default' 		=> 0,
                                     'tooltip' 	=> __('Display field icons for related user meta fields in header or not','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'profile_show_metaicon' ),
                                 ),
                                 array(
                                     'id'       		=> 'profile_show_name',
@@ -809,7 +696,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Show display name in profile header','ultimate-member' ),
                                     'default' 		=> um_get_metadefault('profile_show_name'),
                                     'tooltip' 	=> __('Switch on/off the user name on profile header','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'profile_show_name' ),
                                 ),
                                 array(
                                     'id'       		=> 'profile_show_social_links',
@@ -817,7 +703,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Show social links in profile header','ultimate-member' ),
                                     'default' 		=> um_get_metadefault('profile_show_social_links'),
                                     'tooltip' 	=> __('Switch on/off the social links on profile header','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'profile_show_social_links' ),
                                 ),
                                 array(
                                     'id'       		=> 'profile_show_bio',
@@ -825,7 +710,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Show user description in header','ultimate-member' ),
                                     'default' 		=> um_get_metadefault('profile_show_bio'),
                                     'tooltip' 	=> __('Switch on/off the user description on profile header','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'profile_show_bio' ),
                                 ),
                                 array(
                                     'id'       		=> 'profile_show_html_bio',
@@ -833,7 +717,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Enable html support for user description','ultimate-member' ),
                                     'default' 		=> um_get_metadefault('profile_show_html_bio'),
                                     'tooltip' 	=> __('Switch on/off to enable/disable support for html tags on user description.','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'profile_show_html_bio' ),
                                 ),
                                 array(
                                     'id'       		=> 'profile_bio_maxchars',
@@ -842,7 +725,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'default'  		=> um_get_metadefault('profile_bio_maxchars'),
                                     'tooltip' 	=> __('Maximum number of characters to allow in user description field in header.','ultimate-member'),
                                     'conditional'		=> array( 'profile_show_bio', '=', 1 ),
-                                    'value' 		=> UM()->um_get_option( 'profile_bio_maxchars' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -855,7 +737,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                         'bc' 		=> 'Bottom of Icon',
                                         'lc' 		=> 'Left of Icon',
                                     ),
-                                    'value' 		=> UM()->um_get_option( 'profile_header_menu' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -864,7 +745,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Show a custom message if profile is empty','ultimate-member' ),
                                     'default' 		=> um_get_metadefault('profile_empty_text'),
                                     'tooltip' 	=> __('Switch on/off the custom message that appears when the profile is empty','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'profile_empty_text' ),
                                 ),
                                 array(
                                     'id'       		=> 'profile_empty_text_emo',
@@ -873,7 +753,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'default' 		=> um_get_metadefault('profile_empty_text_emo'),
                                     'tooltip' 	=> __('Switch on/off the emoticon (sad face) that appears above the message','ultimate-member'),
                                     'conditional'		=> array( 'profile_empty_text', '=', 1 ),
-                                    'value' 		=> UM()->um_get_option( 'profile_empty_text_emo' ),
                                 )
                             )
                         ),
@@ -891,7 +770,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'tooltip' 	=> __( 'This will be the default template to output registration' ),
                                     'default'  		=> um_get_metadefault('register_template'),
                                     'options' 		=> UM()->shortcodes()->get_templates( 'register' ),
-                                    'value' 		=> UM()->um_get_option( 'register_template' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -900,7 +778,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Registration Maximum Width','ultimate-member' ),
                                     'default'  		=> um_get_metadefault('register_max_width'),
                                     'tooltip' 	=> __('The maximum width this shortcode can take from the page width','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'register_max_width' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -914,7 +791,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                         'left' 				=> __('Left aligned'),
                                         'right' 			=> __('Right aligned'),
                                     ),
-                                    'value' 		=> UM()->um_get_option( 'register_align' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -928,7 +804,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                         'label' 			=> __('Show with label'),
                                         'off' 				=> __('Turn off'),
                                     ),
-                                    'value' 		=> UM()->um_get_option( 'register_icons' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -937,7 +812,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Registration Primary Button Text','ultimate-member' ),
                                     'default'  		=> um_get_metadefault('register_primary_btn_word'),
                                     'tooltip' 	   		=> __('The text that is used for primary button text','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'register_primary_btn_word' ),
                                     'size'          => 'medium'
                                 ),
                                 array(
@@ -946,7 +820,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Registration Secondary Button','ultimate-member' ),
                                     'default' 		=> 1,
                                     'tooltip' 	=> __('Switch on/off the secondary button display in the form','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'register_secondary_btn' ),
                                 ),
                                 array(
                                     'id'      		=> 'register_secondary_btn_word',
@@ -955,7 +828,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'default'  		=> um_get_metadefault('register_secondary_btn_word'),
                                     'tooltip' 	=> __('The text that is used for the secondary button text','ultimate-member'),
                                     'conditional'		=> array( 'register_secondary_btn', '=', 1 ),
-                                    'value' 		=> UM()->um_get_option( 'register_secondary_btn_word' ),
                                     'size'          => 'medium'
                                 ),
                                 array(
@@ -965,7 +837,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'default'  		=> um_get_metadefault('register_secondary_btn_url'),
                                     'tooltip' 	=> __('You can replace default link for this button by entering custom URL','ultimate-member'),
                                     'conditional'		=> array( 'register_secondary_btn', '=', 1 ),
-                                    'value' 		=> UM()->um_get_option( 'register_secondary_btn_url' ),
                                     'size'          => 'medium'
                                 ),
                                 array(
@@ -975,7 +846,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'tooltip' 	=> __( 'This will be the default role assigned to users registering thru registration form','ultimate-member' ),
                                     'default'  		=> um_get_metadefault('register_role'),
                                     'options' 		=> UM()->roles()->get_roles( $add_default = 'Default' ),
-                                    'value' 		=> UM()->um_get_option( 'register_role' ),
                                     'size'          => 'small'
                                 )
                             )
@@ -990,7 +860,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'tooltip' 	=> __( 'This will be the default template to output login','ultimate-member' ),
                                     'default'  		=> um_get_metadefault('login_template'),
                                     'options' 		=> UM()->shortcodes()->get_templates( 'login' ),
-                                    'value' 		=> UM()->um_get_option( 'login_template' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -999,7 +868,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Login Maximum Width','ultimate-member' ),
                                     'default'  		=> um_get_metadefault('login_max_width'),
                                     'tooltip' 	=> __('The maximum width this shortcode can take from the page width','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'login_max_width' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -1013,7 +881,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                         'left' 				=> __('Left aligned','ultimate-member'),
                                         'right' 			=> __('Right aligned','ultimate-member'),
                                     ),
-                                    'value' 		=> UM()->um_get_option( 'login_align' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -1027,7 +894,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                         'label' 			=> __('Show with label','ultimate-member'),
                                         'off' 				=> __('Turn off','ultimate-member'),
                                     ),
-                                    'value' 		=> UM()->um_get_option( 'login_icons' ),
                                     'size'          => 'small'
                                 ),
                                 array(
@@ -1036,7 +902,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Login Primary Button Text','ultimate-member' ),
                                     'default'  		=> um_get_metadefault('login_primary_btn_word'),
                                     'tooltip' 	=> __('The text that is used for primary button text','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'login_primary_btn_word' ),
                                     'size'          => 'medium'
                                 ),
                                 array(
@@ -1045,7 +910,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Login Secondary Button','ultimate-member' ),
                                     'default' 		=> 1,
                                     'tooltip' 	=> __('Switch on/off the secondary button display in the form','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'login_secondary_btn' ),
                                 ),
                                 array(
                                     'id'      		=> 'login_secondary_btn_word',
@@ -1054,7 +918,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'default'  		=> um_get_metadefault('login_secondary_btn_word'),
                                     'tooltip' 	=> __('The text that is used for the secondary button text','ultimate-member'),
                                     'conditional'		=> array( 'login_secondary_btn', '=', 1 ),
-                                    'value' 		=> UM()->um_get_option( 'login_secondary_btn_word' ),
                                     'size'          => 'medium'
                                 ),
                                 array(
@@ -1064,7 +927,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'default'  		=> um_get_metadefault('login_secondary_btn_url'),
                                     'tooltip' 	=> __('You can replace default link for this button by entering custom URL','ultimate-member'),
                                     'conditional'		=> array( 'login_secondary_btn', '=', 1 ),
-                                    'value' 		=> UM()->um_get_option( 'login_secondary_btn_url' ),
                                     'size'          => 'medium'
                                 ),
                                 array(
@@ -1073,7 +935,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Login Forgot Password Link','ultimate-member' ),
                                     'default' 		=> 1,
                                     'tooltip' 	=> __('Switch on/off the forgot password link in login form','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'login_forgot_pass_link' ),
                                 ),
                                 array(
                                     'id'       		=> 'login_show_rememberme',
@@ -1081,7 +942,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                                     'label'    		=> __( 'Show "Remember Me"','ultimate-member' ),
                                     'default' 		=> 1,
                                     'tooltip' 	=> __('Allow users to choose If they want to stay signed in even after closing the browser. If you do not show this option, the default will be to not remember login session.','ultimate-member'),
-                                    'value' 		=> UM()->um_get_option( 'login_show_rememberme' ),
                                 )
                             )
                         )
@@ -1100,16 +960,12 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                             'id'       		=> 'form_asterisk',
                             'type'     		=> 'checkbox',
                             'label'    		=> __( 'Show an asterisk for required fields','ultimate-member' ),
-                            'value' 		=> UM()->um_get_option( 'form_asterisk' ),
-                            'default' 		=> UM()->um_get_default( 'form_asterisk' ),
                         ),
                         array(
                             'id'      		=> 'profile_title',
                             'type'     		=> 'text',
                             'label'    		=> __('User Profile Title','ultimate-member'),
                             'tooltip' 	=> __('This is the title that is displayed on a specific user profile','ultimate-member'),
-                            'value' 		=> UM()->um_get_option( 'profile_title' ),
-                            'default' 		=> UM()->um_get_default( 'profile_title' ),
                             'size'          => 'medium'
                         ),
                         array(
@@ -1117,8 +973,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                             'type'     		=> 'textarea',
                             'label'    		=> __( 'User Profile Dynamic Meta Description','ultimate-member' ),
                             'tooltip'	=> __('This will be used in the meta description that is available for search-engines.','ultimate-member'),
-                            'value' 		=> UM()->um_get_option( 'profile_desc' ),
-                            'default' 		=> UM()->um_get_default( 'profile_desc' ),
                             'args'          => array(
                                 'textarea_rows' => 6
                             )
@@ -1127,16 +981,12 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                             'id'       		=> 'um_allow_tracking',
                             'type'     		=> 'checkbox',
                             'label'   		=> __( 'Allow Tracking','ultimate-member' ),
-                            'value' 		=> UM()->um_get_option( 'um_allow_tracking' ),
-                            'default' 		=> UM()->um_get_default( 'um_allow_tracking' ),
                         ),
                         array(
                             'id'       		=> 'uninstall_on_delete',
                             'type'     		=> 'checkbox',
                             'label'   		=> __( 'Remove Data on Uninstall?', 'ultimate-member' ),
                             'tooltip'	=> __( 'Check this box if you would like Ultimate Member to completely remove all of its data when the plugin/extensions are deleted.', 'ultimate-member' ),
-                            'value' 		=> UM()->um_get_option( 'uninstall_on_delete' ),
-                            'default' 		=> UM()->um_get_default( 'uninstall_on_delete' ),
                         )
                     )
                 ),
@@ -1355,7 +1205,7 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
 
                 $settings = apply_filters( 'um_change_settings_before_save', $_POST['um_options'] );
 
-                foreach ( $settings as $key=>$value ) {
+                foreach ( $settings as $key => $value ) {
                     um_update_option( $key, $value );
                 }
 
@@ -1454,7 +1304,7 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                 return;
 
             foreach ( $_POST['um_options'] as $key => $value ) {
-                $this->previous_licenses[$key] = um_get_option( $key );
+                $this->previous_licenses[$key] = UM()->options()->get( $key );
             }
         }
 
@@ -1595,8 +1445,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                     'type'          => 'checkbox',
                     'label'         => $emails[$email_key]['title'],
                     'tooltip'       => $emails[$email_key]['description'],
-                    'value' 		=> UM()->um_get_option( $email_key . '_on' ),
-                    'default' 		=> UM()->um_get_default( $email_key . '_on' ),
                 ),
                 array(
                     'id'       => $email_key . '_sub',
@@ -1604,8 +1452,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                     'label'    => __( 'Subject Line','ultimate-member' ),
                     'conditional' => array( $email_key . '_on', '=', 1 ),
                     'tooltip' => __('This is the subject line of the e-mail','ultimate-member'),
-                    'value' 		=> UM()->um_get_option( $email_key . '_sub' ),
-                    'default' 		=> UM()->um_get_default( $email_key . '_sub' ),
                 ),
                 array(
                     'id'            => $email_key,
@@ -1614,7 +1460,6 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                     'conditional'   => array( $email_key . '_on', '=', 1 ),
                     'tooltip' 	    => __('This is the content of the e-mail','ultimate-member'),
                     'value' 		=> UM()->mail()->get_email_template( $email_key ),
-                    'default' 		=> UM()->um_get_default( $email_key ),
                     'in_theme'      => $in_theme
                 ),
             );
@@ -1636,7 +1481,7 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
                 <table class="form-table um-settings-section">
                     <tbody>
                     <?php foreach ( $section_fields as $field_data ) {
-                        $option_value = um_get_option( $field_data['id'] );
+                        $option_value = UM()->options()->get( $field_data['id'] );
                         $value = ! empty( $option_value ) ? $option_value : ( ! empty( $field_data['default'] ) ? $field_data['default'] : '' );
 
                         $license = get_option( "{$field_data['id']}_edd_answer" );
@@ -2012,99 +1857,99 @@ Memory Limit:   				<?php echo ( um_let_to_num( WP_MEMORY_LIMIT )/( 1024 ) )."MB
 
 Version:						<?php echo ultimatemember_version . "\n"; ?>
 Upgraded From:            		<?php echo get_option( 'um_version_upgraded_from', 'None' ) . "\n"; ?>
-Current URL Method:			<?php echo um_get_option( 'current_url_method' ). "\n"; ?>
-Cache User Profile:			<?php if( um_get_option( 'um_profile_object_cache_stop' ) == 1 ){ echo "No"; }else{ echo "Yes"; } echo "\n"; ?>
-Generate Slugs on Directories:	<?php if( um_get_option( 'um_generate_slug_in_directory' ) == 1 ){ echo "No"; }else{ echo "Yes"; } echo "\n"; ?>
-Rewrite Rules: 				<?php if( um_get_option( 'um_flush_stop' ) == 1 ){ echo "No"; }else{ echo "Yes"; } echo "\n"; ?>
-Force UTF-8 Encoding: 		<?php if( um_get_option( 'um_force_utf8_strings' ) == 1 ){ echo "Yes"; }else{ echo "No"; } echo "\n"; ?>
-Time Check Security: 			<?php if( um_get_option( 'enable_timebot' ) == 1 ){ echo "Yes"; }else{ echo "No"; } echo "\n"; ?>
+Current URL Method:			<?php echo UM()->options()->get( 'current_url_method' ). "\n"; ?>
+Cache User Profile:			<?php if( UM()->options()->get( 'um_profile_object_cache_stop' ) == 1 ){ echo "No"; }else{ echo "Yes"; } echo "\n"; ?>
+Generate Slugs on Directories:	<?php if( UM()->options()->get( 'um_generate_slug_in_directory' ) == 1 ){ echo "No"; }else{ echo "Yes"; } echo "\n"; ?>
+Rewrite Rules: 				<?php if( UM()->options()->get( 'um_flush_stop' ) == 1 ){ echo "No"; }else{ echo "Yes"; } echo "\n"; ?>
+Force UTF-8 Encoding: 		<?php if( UM()->options()->get( 'um_force_utf8_strings' ) == 1 ){ echo "Yes"; }else{ echo "No"; } echo "\n"; ?>
+Time Check Security: 			<?php if( UM()->options()->get( 'enable_timebot' ) == 1 ){ echo "Yes"; }else{ echo "No"; } echo "\n"; ?>
 JS/CSS Compression: 			<?php if ( defined('SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) { echo "Yes"; }else{ echo "No"; } echo "\n"; ?>
 <?php if( is_multisite() ): ?>
-    Network Structure:			<?php echo um_get_option( 'network_permalink_structure' ). "\n"; ?>
+    Network Structure:			<?php echo UM()->options()->get( 'network_permalink_structure' ). "\n"; ?>
 <?php endif; ?>
-Nav Menu Settings: 			<?php if( um_get_option( 'disable_menu' ) == 0 ){ echo "Yes"; }else{ echo "No"; } echo "\n"; ?>
-Port Forwarding in URL: 		<?php if( um_get_option( 'um_port_forwarding_url' ) == 1 ){ echo "Yes"; }else{ echo "No"; } echo "\n"; ?>
-Exclude CSS/JS on Home: 		<?php if( um_get_option( 'js_css_exlcude_home' ) == 1 ){ echo "Yes"; }else{ echo "No"; } echo "\n"; ?>
+Nav Menu Settings: 			<?php if( UM()->options()->get( 'disable_menu' ) == 0 ){ echo "Yes"; }else{ echo "No"; } echo "\n"; ?>
+Port Forwarding in URL: 		<?php if( UM()->options()->get( 'um_port_forwarding_url' ) == 1 ){ echo "Yes"; }else{ echo "No"; } echo "\n"; ?>
+Exclude CSS/JS on Home: 		<?php if( UM()->options()->get( 'js_css_exlcude_home' ) == 1 ){ echo "Yes"; }else{ echo "No"; } echo "\n"; ?>
 
 
 --- UM Pages Configuration ---
 
 <?php do_action("um_install_info_before_page_config") ?>
-User:						<?php echo get_permalink( um_get_option('core_user') ) . "\n"; ?>
-Account:						<?php echo get_permalink( um_get_option('core_account') ) . "\n"; ?>
-Members:					<?php echo get_permalink( um_get_option('core_members') ) . "\n"; ?>
-Register:						<?php echo get_permalink( um_get_option('core_register') ) . "\n"; ?>
-Login:						<?php echo get_permalink( um_get_option('core_login') ) . "\n"; ?>
-Logout:						<?php echo get_permalink( um_get_option('core_logout') ) . "\n"; ?>
-Password Reset:				<?php echo get_permalink( um_get_option('core_password-reset') ) . "\n"; ?>
+User:						<?php echo get_permalink( UM()->options()->get('core_user') ) . "\n"; ?>
+Account:						<?php echo get_permalink( UM()->options()->get('core_account') ) . "\n"; ?>
+Members:					<?php echo get_permalink( UM()->options()->get('core_members') ) . "\n"; ?>
+Register:						<?php echo get_permalink( UM()->options()->get('core_register') ) . "\n"; ?>
+Login:						<?php echo get_permalink( UM()->options()->get('core_login') ) . "\n"; ?>
+Logout:						<?php echo get_permalink( UM()->options()->get('core_logout') ) . "\n"; ?>
+Password Reset:				<?php echo get_permalink( UM()->options()->get('core_password-reset') ) . "\n"; ?>
 <?php do_action("um_install_info_after_page_config") ?>
 
 
 --- UM Users Configuration ---
 
-Default New User Role: 		<?php  echo um_get_option('default_role') . "\n"; ?>
-Profile Permalink Base:		<?php  echo um_get_option('permalink_base') . "\n"; ?>
-User Display Name:			<?php  echo um_get_option('display_name') . "\n"; ?>
-Force Name to Uppercase:		<?php echo $this->info_value( um_get_option('force_display_name_capitlized'), 'yesno', true ); ?>
-Redirect author to profile: 		<?php echo $this->info_value( um_get_option('author_redirect'), 'yesno', true ); ?>
-Enable Members Directory:	<?php echo $this->info_value( um_get_option('members_page'), 'yesno', true ); ?>
-Use Gravatars: 				<?php echo $this->info_value( um_get_option('use_gravatars'), 'yesno', true ); ?>
-<?php if( um_get_option('use_gravatars') ): ?>Gravatar builtin image:		<?php  echo um_get_option('use_um_gravatar_default_builtin_image') . "\n"; ?>
-    UM Avatar as blank Gravatar: 	<?php echo $this->info_value( um_get_option('use_um_gravatar_default_image'), 'yesno', true ); ?><?php endif; ?>
-Require a strong password: 	<?php echo $this->info_value( um_get_option('reset_require_strongpass'), 'onoff', true ); ?>
-Editable primary email field in profile view:	<?php echo $this->info_value( um_get_option('editable_primary_email_in_profile'), 'onoff', true ); ?>
+Default New User Role: 		<?php  echo UM()->options()->get('default_role') . "\n"; ?>
+Profile Permalink Base:		<?php  echo UM()->options()->get('permalink_base') . "\n"; ?>
+User Display Name:			<?php  echo UM()->options()->get('display_name') . "\n"; ?>
+Force Name to Uppercase:		<?php echo $this->info_value( UM()->options()->get('force_display_name_capitlized'), 'yesno', true ); ?>
+Redirect author to profile: 		<?php echo $this->info_value( UM()->options()->get('author_redirect'), 'yesno', true ); ?>
+Enable Members Directory:	<?php echo $this->info_value( UM()->options()->get('members_page'), 'yesno', true ); ?>
+Use Gravatars: 				<?php echo $this->info_value( UM()->options()->get('use_gravatars'), 'yesno', true ); ?>
+<?php if( UM()->options()->get('use_gravatars') ): ?>Gravatar builtin image:		<?php  echo UM()->options()->get('use_um_gravatar_default_builtin_image') . "\n"; ?>
+    UM Avatar as blank Gravatar: 	<?php echo $this->info_value( UM()->options()->get('use_um_gravatar_default_image'), 'yesno', true ); ?><?php endif; ?>
+Require a strong password: 	<?php echo $this->info_value( UM()->options()->get('reset_require_strongpass'), 'onoff', true ); ?>
+Editable primary email field in profile view:	<?php echo $this->info_value( UM()->options()->get('editable_primary_email_in_profile'), 'onoff', true ); ?>
 
 
 --- UM Access Configuration ---
 
-Panic Key: 								<?php  echo um_get_option('panic_key') . "\n"; ?>
-Global Site Access:						<?php  $arr = array('Site accessible to Everyone','','Site accessible to Logged In Users'); echo $arr[ intval( um_get_option('accessible') ) ] . "\n"; ?>
-<?php if( um_get_option('accessible') == 2 ) { ?>
-Custom Redirect URL:						<?php echo um_get_option('access_redirect')."\n";?>
-Exclude the following URLs:<?php echo "\t\t\t\t".implode("\t\n\t\t\t\t\t\t\t\t\t\t",um_get_option('access_exclude_uris') )."\n";?>
+Panic Key: 								<?php  echo UM()->options()->get('panic_key') . "\n"; ?>
+Global Site Access:						<?php  $arr = array('Site accessible to Everyone','','Site accessible to Logged In Users'); echo $arr[ intval( UM()->options()->get('accessible') ) ] . "\n"; ?>
+<?php if( UM()->options()->get('accessible') == 2 ) { ?>
+Custom Redirect URL:						<?php echo UM()->options()->get('access_redirect')."\n";?>
+Exclude the following URLs:<?php echo "\t\t\t\t".implode("\t\n\t\t\t\t\t\t\t\t\t\t",UM()->options()->get('access_exclude_uris') )."\n";?>
 <?php } ?>
-Backend Login Screen for Guests:			<?php echo $this->info_value( um_get_option('wpadmin_login'), 'yesno', true ); ?>
-<?php if( ! um_get_option('wpadmin_login') ) { ?>
-Redirect to alternative login page:			<?php if( um_get_option('wpadmin_login_redirect') == 'um_login_page' ){ echo um_get_core_page('login')."\n"; }else{ echo um_get_option('wpadmin_login_redirect_url')."\n"; }?>
+Backend Login Screen for Guests:			<?php echo $this->info_value( UM()->options()->get('wpadmin_login'), 'yesno', true ); ?>
+<?php if( ! UM()->options()->get('wpadmin_login') ) { ?>
+Redirect to alternative login page:			<?php if( UM()->options()->get('wpadmin_login_redirect') == 'um_login_page' ){ echo um_get_core_page('login')."\n"; }else{ echo UM()->options()->get('wpadmin_login_redirect_url')."\n"; }?>
 <?php } ?>
-Backend Register Screen for Guests:		<?php echo $this->info_value( um_get_option('wpadmin_register'), 'yesno', true ); ?>
-<?php if( ! um_get_option('wpadmin_register') ) { ?>
-Redirect to alternative register page:		<?php if( um_get_option('wpadmin_register_redirect') == 'um_register_page' ){ echo um_get_core_page('register')."\n"; }else{ echo um_get_option('wpadmin_register_redirect_url')."\n"; }?>
+Backend Register Screen for Guests:		<?php echo $this->info_value( UM()->options()->get('wpadmin_register'), 'yesno', true ); ?>
+<?php if( ! UM()->options()->get('wpadmin_register') ) { ?>
+Redirect to alternative register page:		<?php if( UM()->options()->get('wpadmin_register_redirect') == 'um_register_page' ){ echo um_get_core_page('register')."\n"; }else{ echo UM()->options()->get('wpadmin_register_redirect_url')."\n"; }?>
 <?php } ?>
-Access Control widget for Admins only: 		<?php echo $this->info_value( um_get_option('access_widget_admin_only'), 'yesno', true ); ?>
-Enable the Reset Password Limit:			<?php echo $this->info_value( um_get_option('enable_reset_password_limit'), 'yesno', true ); ?>
-<?php if( um_get_option('enable_reset_password_limit') ) { ?>
-Reset Password Limit: <?php echo um_get_option('reset_password_limit_number') ?>
-Disable Reset Password Limit for Admins: <?php echo $this->info_value( um_get_option('disable_admin_reset_password_limit'), 'yesno', true ) ?>
+Access Control widget for Admins only: 		<?php echo $this->info_value( UM()->options()->get('access_widget_admin_only'), 'yesno', true ); ?>
+Enable the Reset Password Limit:			<?php echo $this->info_value( UM()->options()->get('enable_reset_password_limit'), 'yesno', true ); ?>
+<?php if( UM()->options()->get('enable_reset_password_limit') ) { ?>
+Reset Password Limit: <?php echo UM()->options()->get('reset_password_limit_number') ?>
+Disable Reset Password Limit for Admins: <?php echo $this->info_value( UM()->options()->get('disable_admin_reset_password_limit'), 'yesno', true ) ?>
 <?php } ?>
-<?php $wpadmin_allow_ips = um_get_option( 'wpadmin_allow_ips' ); if( ! empty( $wpadmin_allow_ips ) ) { ?>
-Whitelisted Backend IPs: 					<?php echo count( explode("\n",trim(um_get_option('wpadmin_allow_ips') ) ) )."\n"; ?>
+<?php $wpadmin_allow_ips = UM()->options()->get( 'wpadmin_allow_ips' ); if( ! empty( $wpadmin_allow_ips ) ) { ?>
+Whitelisted Backend IPs: 					<?php echo count( explode("\n",trim(UM()->options()->get('wpadmin_allow_ips') ) ) )."\n"; ?>
 <?php } ?>
-<?php $blocked_ips = um_get_option('blocked_ips'); if( ! empty( $blocked_ips ) ){ ?>
-Blocked IP Addresses: 					<?php echo  count( explode("\n",um_get_option('blocked_ips') ) )."\n"; ?>
+<?php $blocked_ips = UM()->options()->get('blocked_ips'); if( ! empty( $blocked_ips ) ){ ?>
+Blocked IP Addresses: 					<?php echo  count( explode("\n",UM()->options()->get('blocked_ips') ) )."\n"; ?>
 <?php } ?>
-<?php $blocked_emails = um_get_option('blocked_emails'); if( ! empty( $blocked_emails ) ){ ?>
-Blocked Email Addresses: 					<?php echo  count( explode("\n",um_get_option('blocked_emails') ) )."\n"; ?>
+<?php $blocked_emails = UM()->options()->get('blocked_emails'); if( ! empty( $blocked_emails ) ){ ?>
+Blocked Email Addresses: 					<?php echo  count( explode("\n",UM()->options()->get('blocked_emails') ) )."\n"; ?>
 <?php } ?>
-<?php $blocked_words =  um_get_option('blocked_words'); if( ! empty( $blocked_words ) ){ ?>
-Blacklist Words: 							<?php echo  count( explode("\n",um_get_option('blocked_words') ) )."\n"; ?>
+<?php $blocked_words =  UM()->options()->get('blocked_words'); if( ! empty( $blocked_words ) ){ ?>
+Blacklist Words: 							<?php echo  count( explode("\n",UM()->options()->get('blocked_words') ) )."\n"; ?>
 <?php } ?>
 
 
 --- UM Email Configurations ---
 
-Mail appears from:  			<?php $mail_from = um_get_option('mail_from'); if( ! empty( $mail_from ) ){echo um_get_option('mail_from');}else{echo "-";}; echo "\n";?>
-Mail appears from address:  	<?php $mail_from_addr = um_get_option('mail_from_addr'); if( ! empty( $mail_from_addr ) ){echo um_get_option('mail_from_addr');}else{echo "-";}; echo "\n";?>
-Use HTML for E-mails:   		<?php echo $this->info_value( um_get_option('email_html'), 'yesno', true ); ?>
-Account Welcome Email:  		<?php echo $this->info_value( um_get_option('welcome_email_on'), 'yesno', true ); ?>
-Account Activation Email:   	<?php echo $this->info_value( um_get_option('checkmail_email_on'), 'yesno', true ); ?>
-Pending Review Email:   		<?php echo $this->info_value( um_get_option('pending_email_on'), 'yesno', true ); ?>
-Account Approved Email: 		<?php echo $this->info_value( um_get_option('approved_email_on'), 'yesno', true ); ?>
-Account Rejected Email: 		<?php echo $this->info_value( um_get_option('rejected_email_on'), 'yesno', true ); ?>
-Account Deactivated Email:  	<?php echo $this->info_value( um_get_option('inactive_email_on'), 'yesno', true ); ?>
-Account Deleted Email:  		<?php echo $this->info_value( um_get_option('deletion_email_on'), 'yesno', true ); ?>
-Password Reset Email:   		<?php echo $this->info_value( um_get_option('resetpw_email_on'), 'yesno', true ); ?>
-Password Changed Email: 		<?php echo $this->info_value( um_get_option('changedpw_email_on'), 'yesno', true ); ?>
+Mail appears from:  			<?php $mail_from = UM()->options()->get('mail_from'); if( ! empty( $mail_from ) ){echo UM()->options()->get('mail_from');}else{echo "-";}; echo "\n";?>
+Mail appears from address:  	<?php $mail_from_addr = UM()->options()->get('mail_from_addr'); if( ! empty( $mail_from_addr ) ){echo UM()->options()->get('mail_from_addr');}else{echo "-";}; echo "\n";?>
+Use HTML for E-mails:   		<?php echo $this->info_value( UM()->options()->get('email_html'), 'yesno', true ); ?>
+Account Welcome Email:  		<?php echo $this->info_value( UM()->options()->get('welcome_email_on'), 'yesno', true ); ?>
+Account Activation Email:   	<?php echo $this->info_value( UM()->options()->get('checkmail_email_on'), 'yesno', true ); ?>
+Pending Review Email:   		<?php echo $this->info_value( UM()->options()->get('pending_email_on'), 'yesno', true ); ?>
+Account Approved Email: 		<?php echo $this->info_value( UM()->options()->get('approved_email_on'), 'yesno', true ); ?>
+Account Rejected Email: 		<?php echo $this->info_value( UM()->options()->get('rejected_email_on'), 'yesno', true ); ?>
+Account Deactivated Email:  	<?php echo $this->info_value( UM()->options()->get('inactive_email_on'), 'yesno', true ); ?>
+Account Deleted Email:  		<?php echo $this->info_value( UM()->options()->get('deletion_email_on'), 'yesno', true ); ?>
+Password Reset Email:   		<?php echo $this->info_value( UM()->options()->get('resetpw_email_on'), 'yesno', true ); ?>
+Password Changed Email: 		<?php echo $this->info_value( UM()->options()->get('changedpw_email_on'), 'yesno', true ); ?>
 
 
 --- UM Total Users ---
@@ -2278,7 +2123,7 @@ Use Only Cookies:         			<?php echo ini_get( 'session.use_only_cookies' ) ?
         function render_settings_section( $section_fields, $current_tab, $current_subtab ) {
             ob_start();
 
-            UM()->admin_forms( array(
+            UM()->admin_forms_settings( array(
                 'class'		=> 'um_options-' . $current_tab . '-' . $current_subtab . ' um-third-column',
                 'prefix_id'	=> 'um_options',
                 'fields'    => $section_fields
diff --git a/includes/admin/core/list-tables/emails-list-table.php b/includes/admin/core/list-tables/emails-list-table.php
index 67580ccc..0336cbb8 100644
--- a/includes/admin/core/list-tables/emails-list-table.php
+++ b/includes/admin/core/list-tables/emails-list-table.php
@@ -134,7 +134,7 @@ class UM_Emails_List_Table extends WP_List_Table {
     }
 
     function column_email( $item ) {
-        $active = um_get_option( $item['key'] . '_on' );
+        $active = UM()->options()->get( $item['key'] . '_on' );
 
         return '<span class="dashicons um-notification-status ' . ( ! empty( $active ) ? 'um-notification-is-active dashicons-yes' : 'dashicons-no-alt' ) . '"></span><a href="' . add_query_arg( array( 'email' => $item['key'] ) ) . '"><strong>'. $item['title'] . '</strong></a>';
     }
@@ -142,7 +142,7 @@ class UM_Emails_List_Table extends WP_List_Table {
 
     function column_recipients( $item ) {
         if ( $item['recipient'] == 'admin' )
-            return um_get_option( 'admin_email' );
+            return UM()->options()->get( 'admin_email' );
         else
             return __( 'Member', 'ultimate-member' );
     }
diff --git a/includes/admin/core/packages/2.0-beta1.php b/includes/admin/core/packages/2.0-beta1.php
index e2e8bf1a..757ea5db 100644
--- a/includes/admin/core/packages/2.0-beta1.php
+++ b/includes/admin/core/packages/2.0-beta1.php
@@ -65,7 +65,7 @@ $profile_forms = $forms_query->query( array(
 
 $css = '';
 
-$active_color = um_get_option( 'active_color' );
+$active_color = UM()->options()->get( 'active_color' );
 if ( $active_color ) {
     $css .= "
 .um .um-tip:hover,
@@ -110,7 +110,7 @@ div.uimob800 .um-account-side li a.current:hover
 ";
 }
 
-$secondary_color = um_get_option( 'secondary_color' );
+$secondary_color = UM()->options()->get( 'secondary_color' );
 if ( $secondary_color ) {
     $css .= "
 .um .um-field-group-head:hover,
@@ -137,7 +137,7 @@ $css .= "
 	margin-right: auto!important;
 }";
 
-$primary_btn_color = um_get_option( 'primary_btn_color' );
+$primary_btn_color = UM()->options()->get( 'primary_btn_color' );
 if ( $primary_btn_color ) {
     $css .= "
 .um input[type=submit]:disabled:hover {
@@ -159,7 +159,7 @@ if ( $primary_btn_color ) {
 ";
 }
 
-$primary_btn_hover = um_get_option( 'primary_btn_hover' );
+$primary_btn_hover = UM()->options()->get( 'primary_btn_hover' );
 if ( $primary_btn_hover ) {
     $css .= "
 .um input[type=submit].um-button:hover,
@@ -174,7 +174,7 @@ if ( $primary_btn_hover ) {
 ";
 }
 
-$primary_btn_text = um_get_option( 'primary_btn_text' );
+$primary_btn_text = UM()->options()->get( 'primary_btn_text' );
 if ( $primary_btn_text ) {
     $css .= "
 .um .um-button {
@@ -183,7 +183,7 @@ if ( $primary_btn_text ) {
 ";
 }
 
-$secondary_btn_color = um_get_option( 'secondary_btn_color' );
+$secondary_btn_color = UM()->options()->get( 'secondary_btn_color' );
 if ( $secondary_btn_color ) {
     $css .= "
 .um .um-button.um-alt,
@@ -193,7 +193,7 @@ if ( $secondary_btn_color ) {
 ";
 }
 
-$secondary_btn_hover = um_get_option( 'secondary_btn_hover' );
+$secondary_btn_hover = UM()->options()->get( 'secondary_btn_hover' );
 if ( $secondary_btn_hover ) {
     $css .= "
 .um .um-button.um-alt:hover,
@@ -203,7 +203,7 @@ if ( $secondary_btn_hover ) {
 ";
 }
 
-$secondary_btn_text = um_get_option( 'secondary_btn_text' );
+$secondary_btn_text = UM()->options()->get( 'secondary_btn_text' );
 if ( $secondary_btn_text ) {
     $css .= "
 .um .um-button.um-alt,
@@ -213,7 +213,7 @@ if ( $secondary_btn_text ) {
 ";
 }
 
-$help_tip_color = um_get_option( 'help_tip_color' );
+$help_tip_color = UM()->options()->get( 'help_tip_color' );
 if ( $help_tip_color ) {
     $css .= "
 .um .um-tip {
@@ -222,7 +222,7 @@ if ( $help_tip_color ) {
 ";
 }
 
-$form_field_label = um_get_option( 'form_field_label' );
+$form_field_label = UM()->options()->get( 'form_field_label' );
 if ( $form_field_label ) {
     $css .= "
 .um .um-field-label {
@@ -231,7 +231,7 @@ if ( $form_field_label ) {
 ";
 }
 
-$form_border = um_get_option( 'form_border' );
+$form_border = UM()->options()->get( 'form_border' );
 if ( $form_border ) {
     $css .= "
 .um .um-form input[type=text],
@@ -255,7 +255,7 @@ if ( $form_border ) {
 ";
 }
 
-$form_border_hover = um_get_option( 'form_border_hover' );
+$form_border_hover = UM()->options()->get( 'form_border_hover' );
 if ( $form_border_hover ) {
     $css .= "
 .um .um-form input[type=text]:focus,
@@ -270,7 +270,7 @@ if ( $form_border_hover ) {
 ";
 }
 
-$form_bg_color = um_get_option( 'form_bg_color' );
+$form_bg_color = UM()->options()->get( 'form_bg_color' );
 if ( $form_bg_color ) {
     $css .= "
 .um .um-form input[type=text],
@@ -286,7 +286,7 @@ if ( $form_bg_color ) {
 ";
 }
 
-$form_bg_color_focus = um_get_option( 'form_bg_color_focus' );
+$form_bg_color_focus = UM()->options()->get( 'form_bg_color_focus' );
 if ( $form_bg_color_focus ) {
     $css .= "
 .um .um-form input[type=text]:focus,
@@ -299,7 +299,7 @@ if ( $form_bg_color_focus ) {
 ";
 }
 
-$form_text_color = um_get_option( 'form_text_color' );
+$form_text_color = UM()->options()->get( 'form_text_color' );
 if ( $form_text_color ) {
     $css .= "
 .um .um-form input[type=text],
@@ -322,7 +322,7 @@ if ( $form_text_color ) {
 ";
 }
 
-$form_placeholder = um_get_option( 'form_placeholder' );
+$form_placeholder = UM()->options()->get( 'form_placeholder' );
 if ( $form_placeholder ) {
     $css .= "
 .um .um-form ::-webkit-input-placeholder
@@ -358,7 +358,7 @@ if ( $form_placeholder ) {
 ";
 }
 
-$form_icon_color = um_get_option( 'form_icon_color' );
+$form_icon_color = UM()->options()->get( 'form_icon_color' );
 if ( $form_icon_color ) {
     $css .= "
 .um .um-field-icon i,
@@ -371,7 +371,7 @@ if ( $form_icon_color ) {
 ";
 }
 
-$form_asterisk_color = um_get_option( 'form_asterisk_color' );
+$form_asterisk_color = UM()->options()->get( 'form_asterisk_color' );
 if ( $form_asterisk_color ) {
     $css .= "
 .um span.um-req
@@ -382,7 +382,7 @@ if ( $form_asterisk_color ) {
 }
 
 
-$profile_photocorner = um_get_option( 'profile_photocorner' );
+$profile_photocorner = UM()->options()->get( 'profile_photocorner' );
 if ( $profile_photocorner == 1 ) {
     $css .= "
 .um .um-profile-photo a.um-profile-photo-img,
@@ -418,7 +418,7 @@ if ( $profile_photocorner == 1 ) {
 ";
 }
 
-$profile_main_bg = um_get_option( 'profile_main_bg' );
+$profile_main_bg = UM()->options()->get( 'profile_main_bg' );
 if ( $profile_main_bg ) {
     $css .= "
 .um-profile {
@@ -427,7 +427,7 @@ if ( $profile_main_bg ) {
 ";
 }
 
-$profile_header_bg = um_get_option( 'profile_header_bg' );
+$profile_header_bg = UM()->options()->get( 'profile_header_bg' );
 if ( $profile_header_bg ) {
     $css .= "
 .um-profile.um .um-header {
@@ -436,7 +436,7 @@ if ( $profile_header_bg ) {
 ";
 }
 
-$profile_header_text = um_get_option( 'profile_header_text' );
+$profile_header_text = UM()->options()->get( 'profile_header_text' );
 if ( $profile_header_text ) {
     $css .= "
 .um-profile.um .um-profile-meta {
@@ -445,7 +445,7 @@ if ( $profile_header_text ) {
 ";
 }
 
-$profile_header_link_color = um_get_option( 'profile_header_link_color' );
+$profile_header_link_color = UM()->options()->get( 'profile_header_link_color' );
 if ( $profile_header_link_color ) {
     $css .= "
 .um-profile.um .um-name a {
@@ -454,7 +454,7 @@ if ( $profile_header_link_color ) {
 ";
 }
 
-$profile_header_link_hcolor = um_get_option( 'profile_header_link_hcolor' );
+$profile_header_link_hcolor = UM()->options()->get( 'profile_header_link_hcolor' );
 if ( $profile_header_link_hcolor ) {
     $css .= "
 .um-profile.um .um-name a:hover {
@@ -463,7 +463,7 @@ if ( $profile_header_link_hcolor ) {
 ";
 }
 
-$profile_header_icon_color = um_get_option( 'profile_header_icon_color' );
+$profile_header_icon_color = UM()->options()->get( 'profile_header_icon_color' );
 if ( $profile_header_icon_color ) {
     $css .= "
 .um-profile.um .um-profile-headericon a {
@@ -472,7 +472,7 @@ if ( $profile_header_icon_color ) {
 ";
 }
 
-$profile_header_icon_hcolor = um_get_option( 'profile_header_icon_hcolor' );
+$profile_header_icon_hcolor = UM()->options()->get( 'profile_header_icon_hcolor' );
 if ( $profile_header_icon_hcolor ) {
     $css .= "
 .um-profile.um .um-profile-headericon a:hover,
@@ -1221,7 +1221,7 @@ foreach ( $emails as $email_key => $value ) {
     $theme_template_path = UM()->mail()->get_template_file( 'theme', $email_key );
 
     if ( ! $in_theme ) {
-        $setting_value = um_get_option( $email_key );
+        $setting_value = UM()->options()->get( $email_key );
 
         UM()->mail()->copy_email_template( $email_key );
 
@@ -1272,7 +1272,7 @@ foreach ( $menus as $menu ) {
 }
 
 
-$profile_tab_main_roles = um_get_option( 'profile_tab_main_roles' );
+$profile_tab_main_roles = UM()->options()->get( 'profile_tab_main_roles' );
 $profile_tab_main_roles = ! $profile_tab_main_roles ? array() : $profile_tab_main_roles;
 if ( ! empty( $profile_tab_main_roles ) ) {
     $profile_tab_main_roles = array_map( function( $item ) {
@@ -1282,7 +1282,7 @@ if ( ! empty( $profile_tab_main_roles ) ) {
     um_update_option( 'profile_tab_main_roles', $profile_tab_main_roles );
 }
 
-$profile_tab_posts_roles = um_get_option( 'profile_tab_posts_roles' );
+$profile_tab_posts_roles = UM()->options()->get( 'profile_tab_posts_roles' );
 $profile_tab_posts_roles = ! $profile_tab_posts_roles ? array() : $profile_tab_posts_roles;
 if ( ! empty( $profile_tab_posts_roles ) ) {
     $profile_tab_posts_roles = array_map( function( $item ) {
@@ -1292,7 +1292,7 @@ if ( ! empty( $profile_tab_posts_roles ) ) {
     um_update_option( 'profile_tab_posts_roles', $profile_tab_posts_roles );
 }
 
-$profile_tab_comments_roles = um_get_option( 'profile_tab_comments_roles' );
+$profile_tab_comments_roles = UM()->options()->get( 'profile_tab_comments_roles' );
 $profile_tab_comments_roles = ! $profile_tab_comments_roles ? array() : $profile_tab_comments_roles;
 if ( ! empty( $profile_tab_comments_roles ) ) {
     $profile_tab_comments_roles = array_map( function( $item ) {
@@ -1302,7 +1302,7 @@ if ( ! empty( $profile_tab_comments_roles ) ) {
     um_update_option( 'profile_tab_comments_roles', $profile_tab_comments_roles );
 }
 
-$profile_tab_activity_roles = um_get_option( 'profile_tab_activity_roles' );
+$profile_tab_activity_roles = UM()->options()->get( 'profile_tab_activity_roles' );
 $profile_tab_activity_roles = ! $profile_tab_activity_roles ? array() : $profile_tab_activity_roles;
 if ( ! empty( $profile_tab_activity_roles ) ) {
     $profile_tab_activity_roles = array_map( function( $item ) {
@@ -1312,7 +1312,7 @@ if ( ! empty( $profile_tab_activity_roles ) ) {
     um_update_option( 'profile_tab_activity_roles', $profile_tab_activity_roles );
 }
 
-$profile_tab_messages_roles = um_get_option( 'profile_tab_messages_roles' );
+$profile_tab_messages_roles = UM()->options()->get( 'profile_tab_messages_roles' );
 $profile_tab_messages_roles = ! $profile_tab_messages_roles ? array() : $profile_tab_messages_roles;
 if ( ! empty( $profile_tab_messages_roles ) ) {
     $profile_tab_messages_roles = array_map( function( $item ) {
@@ -1322,7 +1322,7 @@ if ( ! empty( $profile_tab_messages_roles ) ) {
     um_update_option( 'profile_tab_messages_roles', $profile_tab_messages_roles );
 }
 
-$profile_tab_reviews_roles = um_get_option( 'profile_tab_reviews_roles' );
+$profile_tab_reviews_roles = UM()->options()->get( 'profile_tab_reviews_roles' );
 $profile_tab_reviews_roles = ! $profile_tab_reviews_roles ? array() : $profile_tab_reviews_roles;
 if ( ! empty( $profile_tab_reviews_roles ) ) {
     $profile_tab_reviews_roles = array_map( function( $item ) {
@@ -1332,7 +1332,7 @@ if ( ! empty( $profile_tab_reviews_roles ) ) {
     um_update_option( 'profile_tab_reviews_roles', $profile_tab_reviews_roles );
 }
 
-$profile_tab_purchases_roles = um_get_option( 'profile_tab_purchases_roles' );
+$profile_tab_purchases_roles = UM()->options()->get( 'profile_tab_purchases_roles' );
 $profile_tab_purchases_roles = ! $profile_tab_purchases_roles ? array() : $profile_tab_purchases_roles;
 if ( ! empty( $profile_tab_purchases_roles ) ) {
     $profile_tab_purchases_roles = array_map( function( $item ) {
@@ -1342,7 +1342,7 @@ if ( ! empty( $profile_tab_purchases_roles ) ) {
     um_update_option( 'profile_tab_purchases_roles', $profile_tab_purchases_roles );
 }
 
-$profile_tab_product_reviews = um_get_option( 'profile_tab_product-reviews_roles' );
+$profile_tab_product_reviews = UM()->options()->get( 'profile_tab_product-reviews_roles' );
 $profile_tab_product_reviews = ! $profile_tab_product_reviews ? array() : $profile_tab_product_reviews;
 if ( ! empty( $profile_tab_product_reviews ) ) {
     $profile_tab_product_reviews = array_map( function( $item ) {
@@ -1353,7 +1353,7 @@ if ( ! empty( $profile_tab_product_reviews ) ) {
 }
 
 
-$profile_tab_forums_roles = um_get_option( 'profile_tab_forums_roles' );
+$profile_tab_forums_roles = UM()->options()->get( 'profile_tab_forums_roles' );
 $profile_tab_forums_roles = ! $profile_tab_forums_roles ? array() : $profile_tab_forums_roles;
 if ( ! empty( $profile_tab_forums_roles ) ) {
     $profile_tab_forums_roles = array_map( function( $item ) {
@@ -1363,7 +1363,7 @@ if ( ! empty( $profile_tab_forums_roles ) ) {
     um_update_option( 'profile_tab_forums_roles', $profile_tab_forums_roles );
 }
 
-$profile_tab_friends_roles = um_get_option( 'profile_tab_friends_roles' );
+$profile_tab_friends_roles = UM()->options()->get( 'profile_tab_friends_roles' );
 $profile_tab_friends_roles = ! $profile_tab_friends_roles ? array() : $profile_tab_friends_roles;
 if ( ! empty( $profile_tab_friends_roles ) ) {
     $profile_tab_friends_roles = array_map( function( $item ) {
@@ -1374,19 +1374,19 @@ if ( ! empty( $profile_tab_friends_roles ) ) {
 }
 
 
-$register_role = um_get_option( 'register_role' );
+$register_role = UM()->options()->get( 'register_role' );
 if ( ! empty( $register_role ) ) {
     $register_role = 'um_' . $register_role;
     um_update_option( 'register_role', $register_role );
 }
 
-$woo_oncomplete_role = um_get_option( 'woo_oncomplete_role' );
+$woo_oncomplete_role = UM()->options()->get( 'woo_oncomplete_role' );
 if ( ! empty( $woo_oncomplete_role ) ) {
     $woo_oncomplete_role = 'um_' . $woo_oncomplete_role;
     um_update_option( 'woo_oncomplete_role', $woo_oncomplete_role );
 }
 
-$woo_oncomplete_except_roles = um_get_option( 'woo_oncomplete_except_roles' );
+$woo_oncomplete_except_roles = UM()->options()->get( 'woo_oncomplete_except_roles' );
 $woo_oncomplete_except_roles = ! $woo_oncomplete_except_roles ? array() : $woo_oncomplete_except_roles;
 if ( ! empty( $woo_oncomplete_except_roles ) ) {
     $woo_oncomplete_except_roles = array_map( function( $item ) {
diff --git a/includes/class-config.php b/includes/class-config.php
index c748cd5d..ea7779ce 100644
--- a/includes/class-config.php
+++ b/includes/class-config.php
@@ -529,7 +529,7 @@ if ( ! class_exists( 'um\Config' ) ) {
 
             foreach ( $core_pages as $page_key ) {
                 $page_option_key = apply_filters( 'um_core_page_id_filter', 'core_' . $page_key );
-                $permalink[$page_key] = UM()->um_get_option( $page_option_key );
+                $permalink[$page_key] = UM()->options()->get( $page_option_key );
             }
 
             return $permalink;
diff --git a/includes/class-functions.php b/includes/class-functions.php
index f2473076..3a35f48c 100644
--- a/includes/class-functions.php
+++ b/includes/class-functions.php
@@ -90,25 +90,6 @@ if ( ! class_exists( 'UM_Functions' ) ) {
         }
 
 
-        function um_get_option( $option_id ) {
-            if ( isset( $this->options[ $option_id ] ) )
-                return apply_filters( "um_get_option_filter__{$option_id}", $this->options[ $option_id ] );
-
-            switch ( $option_id ) {
-                case 'site_name':
-                    return get_bloginfo( 'name' );
-                    break;
-                case 'admin_email':
-                    return get_bloginfo( 'admin_email' );
-                    break;
-                default:
-                    return '';
-                    break;
-
-            }
-        }
-
-
         function um_update_option( $option_id, $value ) {
             $this->options[ $option_id ] = $value;
             update_option( 'um_options', $this->options );
@@ -187,6 +168,7 @@ if ( ! class_exists( 'UM_Functions' ) ) {
             return apply_filters( 'um_excluded_taxonomies', $taxes );
         }
 
+
         /**
          * Output templates
          *
@@ -227,6 +209,7 @@ if ( ! class_exists( 'UM_Functions' ) ) {
                 return $html;
             } else {
                 echo $html;
+                return;
             }
         }
 
diff --git a/includes/class-init.php b/includes/class-init.php
index bdb0fd2b..82db78c7 100644
--- a/includes/class-init.php
+++ b/includes/class-init.php
@@ -332,6 +332,19 @@ if ( ! class_exists( 'UM' ) ) {
         }
 
 
+		/**
+		* @since 2.0
+		*
+		* @return um\core\Options()
+		*/
+		function options() {
+			if ( empty( $this->classes['options'] ) ) {
+				$this->classes['options'] = new um\core\Options();
+			}
+			return $this->classes['options'];
+		}
+
+
         /**
          * @since 2.0
          *
@@ -523,6 +536,20 @@ if ( ! class_exists( 'UM' ) ) {
         }
 
 
+        /**
+         * @since 2.0
+         *
+         * @param $data array
+         * @return um\admin\core\Admin_Forms_Settings()
+         */
+        function admin_forms_settings( $data ) {
+            if ( empty( $this->classes['admin_forms_settings_' . $data['class']] ) ) {
+                $this->classes['admin_forms_settings_' . $data['class']] = new um\admin\core\Admin_Forms_Settings( $data );
+            }
+            return $this->classes['admin_forms_settings_' . $data['class']];
+        }
+
+
 
         /**
          * @since 2.0
diff --git a/includes/core/class-access.php b/includes/core/class-access.php
index 7cd83a85..e5dacc10 100644
--- a/includes/core/class-access.php
+++ b/includes/core/class-access.php
@@ -73,7 +73,7 @@ if ( ! class_exists( 'Access' ) ) {
 			}
 
 			if ( is_tag() ) {
-				$restricted_taxonomies = um_get_option( 'restricted_access_taxonomy_metabox' );
+				$restricted_taxonomies = UM()->options()->get( 'restricted_access_taxonomy_metabox' );
 				if ( empty( $restricted_taxonomies['post_tag'] ) )
 					return;
 
@@ -85,7 +85,7 @@ if ( ! class_exists( 'Access' ) ) {
 				$um_category = get_the_category();
 				$um_category = current( $um_category );
 
-				$restricted_taxonomies = um_get_option( 'restricted_access_taxonomy_metabox' );
+				$restricted_taxonomies = UM()->options()->get( 'restricted_access_taxonomy_metabox' );
 				if ( empty( $restricted_taxonomies[ $um_category->taxonomy ] ) )
 					return;
 
@@ -95,7 +95,7 @@ if ( ! class_exists( 'Access' ) ) {
 			} elseif ( is_tax() ) {
 				$tax_name = get_query_var( 'taxonomy' );
 
-				$restricted_taxonomies = um_get_option( 'restricted_access_taxonomy_metabox' );
+				$restricted_taxonomies = UM()->options()->get( 'restricted_access_taxonomy_metabox' );
 				if ( empty( $restricted_taxonomies[ $tax_name ] ) )
 					return;
 
@@ -182,14 +182,14 @@ if ( ! class_exists( 'Access' ) ) {
 					$this->redirect_handler = $this->set_referer( $redirect_to, "custom_homepage" );
 
 				} else {
-					$access = um_get_option( 'accessible' );
+					$access = UM()->options()->get( 'accessible' );
 
 					if ( $access == 2 ) {
 						//global settings for accessible home page
-						$home_page_accessible = um_get_option( 'home_page_accessible' );
+						$home_page_accessible = UM()->options()->get( 'home_page_accessible' );
 						if ( $home_page_accessible == 0 ) {
 							//get redirect URL if not set get login page by default
-							$redirect = um_get_option( 'access_redirect' );
+							$redirect = UM()->options()->get( 'access_redirect' );
 							if ( ! $redirect )
 								$redirect = um_get_core_page( 'login' );
 
@@ -200,14 +200,14 @@ if ( ! class_exists( 'Access' ) ) {
 			} elseif ( is_category() ) {
 				if ( ! is_user_logged_in() ) {
 
-					$access = um_get_option( 'accessible' );
+					$access = UM()->options()->get( 'accessible' );
 
 					if ( $access == 2 ) {
 						//global settings for accessible home page
-						$category_page_accessible = um_get_option( 'category_page_accessible' );
+						$category_page_accessible = UM()->options()->get( 'category_page_accessible' );
 						if ( $category_page_accessible == 0 ) {
 							//get redirect URL if not set get login page by default
-							$redirect = um_get_option( 'access_redirect' );
+							$redirect = UM()->options()->get( 'access_redirect' );
 							if ( ! $redirect )
 								$redirect = um_get_core_page( 'login' );
 
@@ -217,15 +217,15 @@ if ( ! class_exists( 'Access' ) ) {
 				}
 			}
 
-			$access = um_get_option( 'accessible' );
+			$access = UM()->options()->get( 'accessible' );
 
 			if ( $access == 2 && ! is_user_logged_in() ) {
 
 				//build exclude URLs pages
 				$redirects = array();
-				$redirects[] = untrailingslashit( um_get_option( 'access_redirect' ) );
+				$redirects[] = untrailingslashit( UM()->options()->get( 'access_redirect' ) );
 
-				$exclude_uris = um_get_option( 'access_exclude_uris' );
+				$exclude_uris = UM()->options()->get( 'access_exclude_uris' );
 				if ( ! empty( $exclude_uris ) )
 					$redirects = array_merge( $redirects, $exclude_uris );
 
@@ -236,7 +236,7 @@ if ( ! class_exists( 'Access' ) ) {
 				$current_url_slash = trailingslashit( $current_url );
 
 				//get redirect URL if not set get login page by default
-				$redirect = um_get_option( 'access_redirect' );
+				$redirect = UM()->options()->get( 'access_redirect' );
 				if ( ! $redirect )
 					$redirect = um_get_core_page( 'login' );
 
@@ -378,7 +378,7 @@ if ( ! class_exists( 'Access' ) ) {
 	                return false;
 	        }
 
-            $restricted_posts = um_get_option( 'restricted_access_post_metabox' );
+            $restricted_posts = UM()->options()->get( 'restricted_access_post_metabox' );
 
             if ( ! empty( $post->post_type ) && ! empty( $restricted_posts[ $post->post_type ] ) ) {
                 $restriction = get_post_meta( $post->ID, 'um_content_restriction', true );
@@ -392,7 +392,7 @@ if ( ! class_exists( 'Access' ) ) {
             }
 
             //post hasn't privacy settings....check all terms of this post
-            $restricted_taxonomies = um_get_option( 'restricted_access_taxonomy_metabox' );
+            $restricted_taxonomies = UM()->options()->get( 'restricted_access_taxonomy_metabox' );
 
             //get all taxonomies for current post type
             $taxonomies = get_object_taxonomies( $post );
@@ -441,7 +441,7 @@ if ( ! class_exists( 'Access' ) ) {
             if ( empty( $posts ) )
                 return $posts;
 
-            $restricted_global_message = um_get_option( 'restricted_access_message' );
+            $restricted_global_message = UM()->options()->get( 'restricted_access_message' );
 
             //other filter
             foreach ( $posts as $post ) {
diff --git a/includes/core/class-account.php b/includes/core/class-account.php
index ea32ff7c..35670954 100644
--- a/includes/core/class-account.php
+++ b/includes/core/class-account.php
@@ -221,7 +221,7 @@ if ( ! class_exists( 'Account' ) ) {
          */
         function predefined_fields_hook( $predefined_fields ) {
 
-            $account_hide_in_directory =  um_get_option( 'account_hide_in_directory' );
+            $account_hide_in_directory =  UM()->options()->get( 'account_hide_in_directory' );
 
             if ( ! $account_hide_in_directory )
                 unset( $predefined_fields['hide_in_members'] );
@@ -325,11 +325,11 @@ if ( ! class_exists( 'Account' ) ) {
 
                     $args = 'user_login,first_name,last_name,user_email';
 
-                    if ( ! um_get_option( 'account_name' ) ) {
+                    if ( ! UM()->options()->get( 'account_name' ) ) {
                         $args = 'user_login,user_email';
                     }
 
-                    if ( ! um_get_option( 'account_email' ) && ! um_user( 'can_edit_everyone' ) ) {
+                    if ( ! UM()->options()->get( 'account_email' ) && ! um_user( 'can_edit_everyone' ) ) {
                         $args = str_replace(',user_email','', $args );
                     }
 
diff --git a/includes/core/class-builtin.php b/includes/core/class-builtin.php
index a1b17e1a..c0099a8c 100644
--- a/includes/core/class-builtin.php
+++ b/includes/core/class-builtin.php
@@ -951,9 +951,9 @@ if ( ! class_exists( 'Builtin' ) ) {
                     'upload_text' => __('Upload your photo here','ultimate-member'),
                     'icon' => 'um-faicon-camera',
                     'crop' => 1,
-                    'max_size' => ( um_get_option('profile_photo_max_size') ) ? um_get_option('profile_photo_max_size') : 999999999,
-                    'min_width' => str_replace('px','',um_get_option('profile_photosize')),
-                    'min_height' => str_replace('px','',um_get_option('profile_photosize')),
+                    'max_size' => ( UM()->options()->get('profile_photo_max_size') ) ? UM()->options()->get('profile_photo_max_size') : 999999999,
+                    'min_width' => str_replace('px','',UM()->options()->get('profile_photosize')),
+                    'min_height' => str_replace('px','',UM()->options()->get('profile_photosize')),
                     'private_use' => true,
                 ),
 
@@ -965,10 +965,10 @@ if ( ! class_exists( 'Builtin' ) ) {
                     'upload_text' => __('Upload profile cover here','ultimate-member'),
                     'icon' => 'um-faicon-picture-o',
                     'crop' => 2,
-                    'max_size' => ( um_get_option('cover_photo_max_size') ) ? um_get_option('cover_photo_max_size') : 999999999,
+                    'max_size' => ( UM()->options()->get('cover_photo_max_size') ) ? UM()->options()->get('cover_photo_max_size') : 999999999,
                     'modal_size' => 'large',
-                    'ratio' => str_replace(':1','',um_get_option('profile_cover_ratio')),
-                    'min_width' => um_get_option('cover_min_width'),
+                    'ratio' => str_replace(':1','',UM()->options()->get('profile_cover_ratio')),
+                    'min_width' => UM()->options()->get('cover_min_width'),
                     'private_use' => true,
                 ),
 
diff --git a/includes/core/class-common.php b/includes/core/class-common.php
index 2f4024c2..bf1cec77 100644
--- a/includes/core/class-common.php
+++ b/includes/core/class-common.php
@@ -49,7 +49,7 @@ if ( ! class_exists( 'Common' ) ) {
                 'supports' => array('title')
             ) );
 
-            if ( um_get_option( 'members_page' ) || ! get_option( 'um_options' ) ) {
+            if ( UM()->options()->get( 'members_page' ) || ! get_option( 'um_options' ) ) {
 
                 register_post_type( 'um_directory', array(
                     'labels' => array(
diff --git a/includes/core/class-enqueue.php b/includes/core/class-enqueue.php
index 7b9bd8fe..68282bd6 100644
--- a/includes/core/class-enqueue.php
+++ b/includes/core/class-enqueue.php
@@ -38,7 +38,7 @@ if ( ! class_exists( 'Enqueue' ) ) {
 
             $this->suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || defined('UM_SCRIPT_DEBUG') ) ? '' : '.min';
             
-            $exclude = um_get_option('js_css_exclude');
+            $exclude = UM()->options()->get('js_css_exclude');
             if ( is_array( $exclude ) ) {
                 array_filter( $exclude );
             }
@@ -54,7 +54,7 @@ if ( ! class_exists( 'Enqueue' ) ) {
 
             }
 
-            $include = um_get_option('js_css_include');
+            $include = UM()->options()->get('js_css_include');
             if ( is_array( $include ) ) {
                 array_filter( $include );
             }
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index f07a7338..e79a724c 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -1184,7 +1184,7 @@
 				// fields that need to be disabled in edit mode (profile)
 				$arr_restricted_fields = array( 'user_email', 'username', 'user_login', 'user_password' );
 
-				if (um_get_option( 'editable_primary_email_in_profile' ) == 1) {
+				if ( UM()->options()->get( 'editable_primary_email_in_profile' ) == 1 ) {
 					unset( $arr_restricted_fields[0] ); // remove user_email
 				}
 
@@ -1198,7 +1198,7 @@
 				// required option
 				if (isset( $data['required_opt'] )) {
 					$opt = $data['required_opt'];
-					if (um_get_option( $opt[0] ) != $opt[1]) {
+					if ( UM()->options()->get( $opt[0] ) != $opt[1]) {
 						return;
 					}
 				}
@@ -2744,9 +2744,9 @@
 				// start output here
 				$this->get_fields = $this->get_fields();
 
-				if (um_get_option( 'profile_empty_text' )) {
+				if ( UM()->options()->get( 'profile_empty_text' ) ) {
 
-					$emo = um_get_option( 'profile_empty_text_emo' );
+					$emo = UM()->options()->get( 'profile_empty_text_emo' );
 					if ($emo) {
 						$emo = '<i class="um-faicon-frown-o"></i>';
 					} else {
diff --git a/includes/core/class-files.php b/includes/core/class-files.php
index da77b80d..b1177811 100644
--- a/includes/core/class-files.php
+++ b/includes/core/class-files.php
@@ -251,10 +251,10 @@ if ( ! class_exists( 'Files' ) ) {
             }
 
             list($w, $h) = @getimagesize( $source );
-            if ( $w > um_get_option('image_max_width') ) {
+            if ( $w > UM()->options()->get('image_max_width') ) {
 
                 $ratio = round( $w / $h, 2 );
-                $new_w = um_get_option('image_max_width');
+                $new_w = UM()->options()->get('image_max_width');
                 $new_h = round( $new_w / $ratio, 2 );
 
                 if ( $info['mime'] == 'image/jpeg' ||  $info['mime'] == 'image/gif' ){
@@ -620,7 +620,7 @@ if ( ! class_exists( 'Files' ) ) {
                 list($w, $h) = @getimagesize( $source );
 
 
-                $sizes = um_get_option('photo_thumb_sizes');
+                $sizes = UM()->options()->get( 'photo_thumb_sizes' );
                 foreach( $sizes as $size ) {
 
                     $ratio = round( $w / $h, 2 );
@@ -663,7 +663,7 @@ if ( ! class_exists( 'Files' ) ) {
 
                 list($w, $h) = @getimagesize( $source );
 
-                $sizes = um_get_option('cover_thumb_sizes');
+                $sizes = UM()->options()->get( 'cover_thumb_sizes' );
                 foreach( $sizes as $size ) {
 
                     $ratio = round( $w / $h, 2 );
diff --git a/includes/core/class-form.php b/includes/core/class-form.php
index 4a6dc606..111bfdcb 100644
--- a/includes/core/class-form.php
+++ b/includes/core/class-form.php
@@ -211,10 +211,10 @@ if ( ! class_exists( 'Form' ) ) {
                         $form_timestamp  = trim($_POST['timestamp']);
                         $live_timestamp  = current_time( 'timestamp' );
 
-                        if ( $form_timestamp == '' && um_get_option('enable_timebot') == 1 )
+                        if ( $form_timestamp == '' && UM()->options()->get( 'enable_timebot' ) == 1 )
                             wp_die( __('Hello, spam bot!','ultimate-member') );
 
-                        if ( !current_user_can('manage_options') && $live_timestamp - $form_timestamp < 6 && um_get_option('enable_timebot') == 1  )
+                        if ( !current_user_can('manage_options') && $live_timestamp - $form_timestamp < 6 && UM()->options()->get( 'enable_timebot' ) == 1  )
                             wp_die( __('Whoa, slow down! You\'re seeing this message because you tried to submit a form too fast and we think you might be a spam bot. If you are a real human being please wait a few seconds before submitting the form. Thanks!','ultimate-member') );
 
                     }
@@ -292,7 +292,7 @@ if ( ! class_exists( 'Form' ) ) {
 
             $global_role = get_option( 'default_role' ); // WP Global settings
 
-            $um_global_role = um_get_option( 'register_role' ); // UM Settings Global settings
+            $um_global_role = UM()->options()->get( 'register_role' ); // UM Settings Global settings
             if ( ! empty( $um_global_role ) )
                 $global_role = $um_global_role; // Form Global settings
 
diff --git a/includes/core/class-mail.php b/includes/core/class-mail.php
index 7fa1640a..f25f7975 100644
--- a/includes/core/class-mail.php
+++ b/includes/core/class-mail.php
@@ -34,7 +34,7 @@ if ( ! class_exists( 'Mail' ) ) {
 		function mandrill_nl2br( $nl2br, $message = '' ) {
 
 			// text emails
-			if ( ! um_get_option( 'email_html' ) ) {
+			if ( ! UM()->options()->get( 'email_html' ) ) {
 				$nl2br = true;
 			}
 
@@ -53,12 +53,12 @@ if ( ! class_exists( 'Mail' ) ) {
 		function send( $email, $template, $args = array() ) {
 
 			if ( ! is_email( $email ) ) return;
-			if ( um_get_option( $template . '_on' ) != 1 ) return;
+			if ( UM()->options()->get( $template . '_on' ) != 1 ) return;
 
 			$this->attachments = null;
-			$this->headers = 'From: '. um_get_option('mail_from') .' <'. um_get_option('mail_from_addr') .'>' . "\r\n";
+			$this->headers = 'From: '. UM()->options()->get('mail_from') .' <'. UM()->options()->get('mail_from_addr') .'>' . "\r\n";
 
-			$this->subject = um_convert_tags( um_get_option( $template . '_sub' ), $args );
+			$this->subject = um_convert_tags( UM()->options()->get( $template . '_sub' ), $args );
 
 			$this->message = $this->prepare_template( $template, $args );
 
@@ -107,7 +107,7 @@ if ( ! class_exists( 'Mail' ) ) {
 		function prepare_template( $slug, $args = array() ) {
 			ob_start();
 
-			if ( um_get_option( 'email_html' ) ) {
+			if ( UM()->options()->get( 'email_html' ) ) {
 
 				echo apply_filters( 'um_email_template_html_formatting', '<html>', $slug, $args );
 
@@ -236,7 +236,7 @@ if ( ! class_exists( 'Mail' ) ) {
 		 */
 		function set_content_type( $content_type ) {
 
-			if ( um_get_option( 'email_html' ) ) {
+			if ( UM()->options()->get( 'email_html' ) ) {
 				return 'text/html';
 			} else {
 				return 'text/plain';
diff --git a/includes/core/class-members.php b/includes/core/class-members.php
index 84a53490..f87d3f9c 100644
--- a/includes/core/class-members.php
+++ b/includes/core/class-members.php
@@ -41,7 +41,7 @@ if ( ! class_exists( 'Members' ) ) {
          ***/
         function access_members() {
 
-            if ( um_get_option('members_page') == 0 && um_is_core_page('members') ) {
+            if ( UM()->options()->get('members_page') == 0 && um_is_core_page( 'members' ) ) {
                 um_redirect_home();
             }
 
diff --git a/includes/core/class-options.php b/includes/core/class-options.php
new file mode 100644
index 00000000..9c19a047
--- /dev/null
+++ b/includes/core/class-options.php
@@ -0,0 +1,94 @@
+<?php
+namespace um\core;
+
+// Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) exit;
+
+if ( ! class_exists( 'Options' ) ) {
+	class Options {
+
+		var $options;
+
+		/**
+		 * Access constructor.
+		 */
+		function __construct() {
+			$this->init_variables();
+		}
+
+
+		/**
+		 * Set variables
+		 */
+		function init_variables() {
+			$this->options = get_option( 'um_options' );
+		}
+
+
+		/**
+		 * Get UM option value
+		 *
+		 * @param $option_id
+		 * @return mixed|string|void
+		 */
+		function get( $option_id ) {
+			if ( isset( $this->options[ $option_id ] ) )
+				return apply_filters( "um_get_option_filter__{$option_id}", $this->options[ $option_id ] );
+
+			switch ( $option_id ) {
+				case 'site_name':
+					return get_bloginfo( 'name' );
+					break;
+				case 'admin_email':
+					return get_bloginfo( 'admin_email' );
+					break;
+				default:
+					return '';
+					break;
+			}
+		}
+
+
+		/**
+		 * Update UM option value
+		 *
+		 * @param $option_id
+		 * @param $value
+		 */
+		function update( $option_id, $value ) {
+			$this->options[ $option_id ] = $value;
+			update_option( 'um_options', $this->options );
+		}
+
+
+		/**
+		 * Delete UM option
+		 *
+		 * @param $option_id
+		 */
+		function delete( $option_id ) {
+			if ( ! empty( $this->options[ $option_id ] ) )
+				unset( $this->options[ $option_id ] );
+
+			update_option( 'um_options', $this->options );
+		}
+
+
+		/**
+		 * Get UM option default value
+		 *
+		 * @use UM()->config()
+		 *
+		 * @param $option_id
+		 * @return bool
+		 */
+		function get_default( $option_id ) {
+			$settings_defaults = UM()->config()->settings_defaults;
+			if ( ! isset( $settings_defaults[ $option_id ] ) )
+				return false;
+
+			return $settings_defaults[ $option_id ];
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/includes/core/class-permalinks.php b/includes/core/class-permalinks.php
index 5f3ce7e7..b08537a6 100644
--- a/includes/core/class-permalinks.php
+++ b/includes/core/class-permalinks.php
@@ -79,11 +79,11 @@ if ( ! class_exists( 'Permalinks' ) ) {
          ***	@Get current URL anywhere
          ***/
         function get_current_url( $no_query_params = false ) {
-            $um_get_option = get_option('um_options');
+	        $server_name_method = UM()->options()->get( 'current_url_method' );
+	        $server_name_method = ! empty( $server_name_method ) ? $server_name_method : 'SERVER_NAME';
 
-            $server_name_method = isset( $um_get_option['current_url_method'] ) ? $um_get_option['current_url_method'] : 'SERVER_NAME';
-
-            $um_port_forwarding_url = ( isset( $um_get_option['um_port_forwarding_url'] ) ) ? $um_get_option['um_port_forwarding_url']: '';
+	        $um_port_forwarding_url = UM()->options()->get( 'um_port_forwarding_url' );
+	        $um_port_forwarding_url = ! empty( $um_port_forwarding_url ) ? $um_port_forwarding_url : '';
 
             if ( is_multisite() ) {
 
@@ -99,7 +99,7 @@ if ( ! class_exists( 'Permalinks' ) ) {
                     }
                 } else {*/
 
-                    $network_permalink_structure = UM()->um_get_option("network_permalink_structure");
+                    $network_permalink_structure = UM()->options()->get( 'network_permalink_structure' );
 
                     if(  $network_permalink_structure == "sub-directory" ){
 
@@ -247,11 +247,11 @@ if ( ! class_exists( 'Permalinks' ) ) {
          ***/
         function profile_url( $update_slug = false ) {
             // Permalink base
-            $permalink_base = um_get_option('permalink_base');
+            $permalink_base = UM()->options()->get( 'permalink_base' );
 
             // Get user slug
             $profile_slug = get_user_meta( um_user('ID'), "um_user_profile_url_slug_{$permalink_base}", true );
-            $generate_slug = um_get_option('um_generate_slug_in_directory');
+            $generate_slug = UM()->options()->get( 'um_generate_slug_in_directory' );
 
             // Return existing profile slug
             if( $generate_slug && $update_slug == false && $profile_slug  ){
@@ -300,7 +300,7 @@ if ( ! class_exists( 'Permalinks' ) ) {
             $full_name_permalinks = array( 'name', 'name_dash', 'name_plus' );
             if( in_array( $permalink_base,  $full_name_permalinks ) )
             {
-                $opt_display_name = um_get_option('display_name');
+                $opt_display_name = UM()->options()->get( 'display_name' );
                 $first_name = um_user( 'first_name' );
                 $last_name = um_user( 'last_name' );
                 $full_name = um_user( 'display_name' );
@@ -389,7 +389,7 @@ if ( ! class_exists( 'Permalinks' ) ) {
          */
         function profile_slug( $full_name, $first_name, $last_name ){
 
-            $permalink_base = um_get_option('permalink_base');
+            $permalink_base = UM()->options()->get( 'permalink_base' );
 
             $user_in_url = '';
 
diff --git a/includes/core/class-plugin-updater.php b/includes/core/class-plugin-updater.php
index c0ab02f9..6ba11583 100644
--- a/includes/core/class-plugin-updater.php
+++ b/includes/core/class-plugin-updater.php
@@ -112,7 +112,7 @@ if ( ! class_exists( 'Plugin_Updater' ) ) {
             foreach ( $the_plugs as $key => $value ) {
 
                 if ( in_array( $value, array_keys( $paid_extensions ) ) ) {
-                    $license = um_get_option( "um_{$paid_extensions[ $value ]['key']}_license_key" );
+                    $license = UM()->options()->get( "um_{$paid_extensions[ $value ]['key']}_license_key" );
 
                     if ( empty( $license ) )
                         continue;
diff --git a/includes/core/class-profile.php b/includes/core/class-profile.php
index 1cca4a70..525bdb34 100644
--- a/includes/core/class-profile.php
+++ b/includes/core/class-profile.php
@@ -78,7 +78,7 @@ if ( ! class_exists( 'Profile' ) ) {
         function tabs_active(){
             $tabs = $this->tabs();
             foreach( $tabs as $id => $info ) {
-                if ( !um_get_option('profile_tab_'.$id) && !isset( $info['_builtin'] ) && !isset( $info['custom'] ) )
+                if ( ! UM()->options()->get('profile_tab_'.$id) && !isset( $info['_builtin'] ) && !isset( $info['custom'] ) )
                     unset( $tabs[$id] );
             }
             return $tabs;
@@ -105,7 +105,7 @@ if ( ! class_exists( 'Profile' ) ) {
             $tabs = $this->tabs();
             foreach( $tabs as $id => $info ){
                 if ( isset( $info['name'] ) ) {
-                    if ( um_get_option('profile_tab_'.$id) || isset( $info['_builtin'] ) ) {
+                    if ( UM()->options()->get('profile_tab_'.$id) || isset( $info['_builtin'] ) ) {
                         $primary[$id] = $info['name'];
                     }
                 }
@@ -132,7 +132,7 @@ if ( ! class_exists( 'Profile' ) ) {
          ***	@Check if the user can view the current tab
          ***/
         function can_view_tab( $tab ) {
-            $privacy  = intval( um_get_option( 'profile_tab_' . $tab . '_privacy' ) );
+            $privacy  = intval( UM()->options()->get( 'profile_tab_' . $tab . '_privacy' ) );
             $can_view = false;
 
             switch( $privacy ) {
@@ -151,7 +151,7 @@ if ( ! class_exists( 'Profile' ) ) {
                 case 4:
                     $can_view = false;
                     if( is_user_logged_in() ) {
-                        $roles = um_get_option( 'profile_tab_' . $tab . '_roles' );
+                        $roles = UM()->options()->get( 'profile_tab_' . $tab . '_roles' );
                         if( is_array( $roles )
                             && in_array( UM()->user()->get_role(), $roles ) ) {
                             $can_view = true;
@@ -172,7 +172,7 @@ if ( ! class_exists( 'Profile' ) ) {
          ***/
         function active_tab() {
 
-            $this->active_tab = um_get_option('profile_menu_default_tab');
+            $this->active_tab = UM()->options()->get('profile_menu_default_tab');
 
             if ( get_query_var('profiletab') ) {
                 $this->active_tab = get_query_var('profiletab');
@@ -222,7 +222,7 @@ if ( ! class_exists( 'Profile' ) ) {
 	                    if ( ! $value )
 		                    continue;
 
-                        if ( ! um_get_option( 'profile_show_metaicon' ) ) {
+                        if ( ! UM()->options()->get( 'profile_show_metaicon' ) ) {
                             $icon = '';
                         } else {
 	                        $icon = ! empty( $data['icon'] ) ? '<i class="' . $data['icon'] . '"></i>' : '';
diff --git a/includes/core/class-rewrite.php b/includes/core/class-rewrite.php
index 401585f3..1964d8ea 100644
--- a/includes/core/class-rewrite.php
+++ b/includes/core/class-rewrite.php
@@ -108,7 +108,7 @@ if ( ! class_exists( 'Rewrite' ) ) {
                         'top'
                     );
 
-                    if( ! apply_filters('um_rewrite_flush_rewrite_rules', um_get_option('um_flush_stop') ) )
+                    if( ! apply_filters( 'um_rewrite_flush_rewrite_rules', UM()->options()->get( 'um_flush_stop' ) ) )
                         flush_rewrite_rules( true );
 
                 }
@@ -121,7 +121,7 @@ if ( ! class_exists( 'Rewrite' ) ) {
          ***	@author page to user profile redirect
          ***/
         function redirect_author_page() {
-            if ( um_get_option('author_redirect') && is_author() ) {
+            if ( UM()->options()->get( 'author_redirect' ) && is_author() ) {
                 $id = get_query_var( 'author' );
                 um_fetch_user( $id );
                 exit( wp_redirect( um_user_profile_url() ) );
@@ -136,7 +136,7 @@ if ( ! class_exists( 'Rewrite' ) ) {
 
             if ( um_queried_user() && um_is_core_page('user') ) {
 
-                if ( um_get_option('permalink_base') == 'user_login' ) {
+                if ( UM()->options()->get( 'permalink_base' ) == 'user_login' ) {
 
                     $user_id = username_exists( um_queried_user() );
 
@@ -159,12 +159,12 @@ if ( ! class_exists( 'Rewrite' ) ) {
 
                 }
 
-                if ( um_get_option('permalink_base') == 'user_id' ) {
+                if ( UM()->options()->get( 'permalink_base' ) == 'user_id' ) {
                     $user_id = UM()->user()->user_exists_by_id( um_queried_user() );
 
                 }
 
-                if ( in_array( um_get_option('permalink_base'), array('name','name_dash','name_dot','name_plus') ) ) {
+                if ( in_array( UM()->options()->get( 'permalink_base' ), array('name','name_dash','name_dot','name_plus') ) ) {
                     $user_id = UM()->user()->user_exists_by_name( um_queried_user() );
 
                 }
diff --git a/includes/core/class-tracking.php b/includes/core/class-tracking.php
index b7273ac3..354e3159 100644
--- a/includes/core/class-tracking.php
+++ b/includes/core/class-tracking.php
@@ -73,7 +73,7 @@ if ( ! class_exists( 'Tracking' ) ) {
          ***	@check if tracking is allowed
          ***/
         private function tracking_allowed() {
-            if ( !um_get_option('allow_tracking') )
+            if ( ! UM()->options()->get( 'allow_tracking' ) )
                 return 0;
             return 1;
         }
diff --git a/includes/core/class-user.php b/includes/core/class-user.php
index ec1fd251..09941a2f 100644
--- a/includes/core/class-user.php
+++ b/includes/core/class-user.php
@@ -147,11 +147,11 @@ if ( ! class_exists( 'User' ) ) {
         function get_profile_url( $user_id, $update_slug = false ) {
 
             // Permalink base
-            $permalink_base = um_get_option( 'permalink_base' );
+            $permalink_base = UM()->options()->get( 'permalink_base' );
 
             // Get user slug
             $profile_slug = get_user_meta( $user_id, "um_user_profile_url_slug_{$permalink_base}", true );
-            $generate_slug = um_get_option( 'um_generate_slug_in_directory' );
+            $generate_slug = UM()->options()->get( 'um_generate_slug_in_directory' );
 
             // Return existing profile slug
             if ( $generate_slug && $update_slug == false && $profile_slug )
@@ -420,7 +420,7 @@ if ( ! class_exists( 'User' ) ) {
 
         function get_cached_data( $user_id ) {
 
-            $disallow_cache = um_get_option('um_profile_object_cache_stop');
+            $disallow_cache = UM()->options()->get( 'um_profile_object_cache_stop' );
             if( $disallow_cache ){
                 return '';
             }
@@ -437,7 +437,7 @@ if ( ! class_exists( 'User' ) ) {
 
         function setup_cache( $user_id, $profile ) {
 
-            $disallow_cache = um_get_option('um_profile_object_cache_stop');
+            $disallow_cache = UM()->options()->get( 'um_profile_object_cache_stop' );
             if( $disallow_cache ){
                 return '';
             }
@@ -1158,7 +1158,7 @@ if ( ! class_exists( 'User' ) ) {
         function user_exists_by_name( $value ) {
 
             // Permalink base
-            $permalink_base = um_get_option('permalink_base');
+            $permalink_base = UM()->options()->get( 'permalink_base' );
 
             $raw_value = $value;
             $value = UM()->validation()->safe_name_in_url( $value );
diff --git a/includes/core/um-actions-account.php b/includes/core/um-actions-account.php
index 5012ee47..df4c3b8e 100644
--- a/includes/core/um-actions-account.php
+++ b/includes/core/um-actions-account.php
@@ -46,7 +46,7 @@ function um_submit_account_errors_hook( $args ) {
 							UM()->account()->current_tab = 'password';
 						}
 
-						if ( um_get_option('account_require_strongpass') ) {
+						if ( UM()->options()->get( 'account_require_strongpass' ) ) {
 
 							if ( strlen( utf8_decode( $_POST['user_password'] ) ) < 8 ) {
 								UM()->form()->add_error('user_password', __('Your password must contain at least 8 characters','ultimate-member') );
@@ -72,7 +72,7 @@ function um_submit_account_errors_hook( $args ) {
 			case 'general': {
 				// errors on general tab
 
-				$account_name_require = um_get_option( "account_name_require" );
+				$account_name_require = UM()->options()->get( 'account_name_require' );
 
 				if ( ! empty( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
 					UM()->form()->add_error('user_login', __( 'Your username is invalid', 'ultimate-member' ) );
@@ -233,7 +233,7 @@ function um_submit_account_errors_hook( $args ) {
 	 */
 	add_action( 'um_before_account_delete', 'um_before_account_delete' );
 	function um_before_account_delete() {
-		echo wpautop( um_get_option( 'delete_account_text' ) );
+		echo wpautop( UM()->options()->get( 'delete_account_text' ) );
 	}
 
 
diff --git a/includes/core/um-actions-form.php b/includes/core/um-actions-form.php
index 4ce3f273..59d7f18e 100644
--- a/includes/core/um-actions-form.php
+++ b/includes/core/um-actions-form.php
@@ -5,7 +5,7 @@
 	***/
 	add_action('um_submit_form_errors_hook__blockedemails', 'um_submit_form_errors_hook__blockedemails', 10);
 	function um_submit_form_errors_hook__blockedemails($args){
-		$emails = um_get_option('blocked_emails');
+		$emails = UM()->options()->get('blocked_emails');
 		if ( !$emails )
 			return;
 
@@ -44,7 +44,7 @@
 	***/
 	add_action('um_submit_form_errors_hook__blockedips', 'um_submit_form_errors_hook__blockedips', 10);
 	function um_submit_form_errors_hook__blockedips($args){
-		$ips = um_get_option('blocked_ips');
+		$ips = UM()->options()->get('blocked_ips');
 		if ( !$ips )
 			return;
 
@@ -68,7 +68,7 @@
 		$mode = $args['mode'];
 		$fields = unserialize( $args['custom_fields'] );
 
-		$words = um_get_option('blocked_words');
+		$words = UM()->options()->get('blocked_words');
 		if ( $words != '' ) {
 
 			$words = array_map("rtrim", explode("\n", $words));
@@ -266,7 +266,7 @@
 						}
 					}
                      
-                    $profile_show_html_bio = um_get_option('profile_show_html_bio');
+                    $profile_show_html_bio = UM()->options()->get('profile_show_html_bio');
 					
 					if(  $profile_show_html_bio == 1 && $key !== "description" ){
 						if ( isset( $array['html'] ) && $array['html'] == 0 ) {
@@ -519,8 +519,8 @@
 
 				if ( isset( $args['description'] ) ) {
 					
-					$max_chars = um_get_option('profile_bio_maxchars');
-					$profile_show_bio = um_get_option('profile_show_bio');
+					$max_chars = UM()->options()->get('profile_bio_maxchars');
+					$profile_show_bio = UM()->options()->get('profile_show_bio');
 
 					if( $profile_show_bio ){
 						if ( strlen( utf8_decode( $args['description'] ) ) > $max_chars && $max_chars  ) {
diff --git a/includes/core/um-actions-login.php b/includes/core/um-actions-login.php
index 70e67e9d..f81c8af5 100644
--- a/includes/core/um-actions-login.php
+++ b/includes/core/um-actions-login.php
@@ -172,7 +172,7 @@
 
 		$rememberme = ( isset( $args['rememberme'] ) && 1 ==  $args['rememberme']  && isset( $_REQUEST['rememberme'] ) ) ? 1 : 0;
 
-		if ( ( um_get_option('deny_admin_frontend_login')   && ! isset( $_GET['provider'] ) ) && strrpos( um_user('wp_roles' ), 'administrator' ) !== FALSE ){
+		if ( ( UM()->options()->get('deny_admin_frontend_login')   && ! isset( $_GET['provider'] ) ) && strrpos( um_user('wp_roles' ), 'administrator' ) !== false ) {
 			wp_die( __('This action has been prevented for security measures.','ultimate-member') );
 		}
 
diff --git a/includes/core/um-actions-password.php b/includes/core/um-actions-password.php
index d5c3cef8..592a95d2 100644
--- a/includes/core/um-actions-password.php
+++ b/includes/core/um-actions-password.php
@@ -95,10 +95,10 @@
 		$form_timestamp  = trim($_POST['timestamp']);
 		$live_timestamp  = current_time( 'timestamp' );
 
-		if ( $form_timestamp == '' && um_get_option('enable_timebot') == 1 )
+		if ( $form_timestamp == '' && UM()->options()->get( 'enable_timebot' ) == 1 )
 			wp_die( __('Hello, spam bot!','ultimate-member') );
 
-		if ( $live_timestamp - $form_timestamp < 3 && um_get_option('enable_timebot') == 1 )
+		if ( $live_timestamp - $form_timestamp < 3 && UM()->options()->get( 'enable_timebot' ) == 1 )
 			wp_die( __('Whoa, slow down! You\'re seeing this message because you tried to submit a form too fast and we think you might be a spam bot. If you are a real human being please wait a few seconds before submitting the form. Thanks!','ultimate-member') );
         
         $user = "";
@@ -126,12 +126,12 @@
 			$attempts = (int)get_user_meta( $user_id, 'password_rst_attempts', true );
 			$is_admin = user_can( intval( $user_id ),'manage_options' );
 
-			if( um_get_option('enable_reset_password_limit') ){ // if reset password limit is set
+			if ( UM()->options()->get( 'enable_reset_password_limit' ) ) { // if reset password limit is set
 
-				if(  um_get_option('disable_admin_reset_password_limit') &&  $is_admin ){
+				if ( UM()->options()->get( 'disable_admin_reset_password_limit' ) &&  $is_admin ) {
 					// Triggers this when a user has admin capabilities and when reset password limit is disabled for admins
-				}else{
-					$limit = um_get_option('reset_password_limit_number');
+				} else {
+					$limit = UM()->options()->get( 'reset_password_limit_number' );
 					if ( $attempts >= $limit ) {
 						UM()->form()->add_error('username_b', __('You have reached the limit for requesting password change for this user already. Contact support if you cannot open the email','ultimate-member') );
 					} else {
@@ -156,10 +156,10 @@
 		$form_timestamp  = trim($_POST['timestamp']);
 		$live_timestamp  = current_time( 'timestamp' );
 
-		if ( $form_timestamp == '' && um_get_option('enable_timebot') == 1 )
+		if ( $form_timestamp == '' && UM()->options()->get( 'enable_timebot' ) == 1 )
 			wp_die( __('Hello, spam bot!','ultimate-member') );
 
-		if ( $live_timestamp - $form_timestamp < 3 && um_get_option('enable_timebot') == 1 ){
+		if ( $live_timestamp - $form_timestamp < 3 && UM()->options()->get( 'enable_timebot' ) == 1 ) {
 			wp_die( __('Whoa, slow down! You\'re seeing this message because you tried to submit a form too fast and we think you might be a spam bot. If you are a real human being please wait a few seconds before submitting the form. Thanks!','ultimate-member') );
 		}
 
@@ -181,7 +181,7 @@
 			UM()->form()->add_error('user_password', __('You must enter a new password','ultimate-member') );
 		}
 
-		if ( um_get_option('reset_require_strongpass') ) {
+		if ( UM()->options()->get( 'reset_require_strongpass' ) ) {
 
 			if ( strlen( utf8_decode( $args['user_password'] ) ) < 8 ) {
 				UM()->form()->add_error('user_password', __('Your password must contain at least 8 characters','ultimate-member') );
diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index a5ee6d2c..b8866020 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -7,7 +7,7 @@
 	function um_profile_content_main( $args ) {
 		extract( $args );
 
-		if (!um_get_option( 'profile_tab_main' ) && !isset( $_REQUEST['um_action'] ))
+		if ( ! UM()->options()->get( 'profile_tab_main' ) && ! isset( $_REQUEST['um_action'] ) )
 			return;
 
 		$can_view = apply_filters( 'um_profile_can_view_main', -1, um_profile_id() );
@@ -157,7 +157,7 @@
 
 			um_fetch_user( um_get_requested_user() );
 
-			$content = um_convert_tags( um_get_option( 'profile_desc' ) );
+			$content = um_convert_tags( UM()->options()->get( 'profile_desc' ) );
 			$user_id = um_user( 'ID' );
 			$url = um_user_profile_url();
 
@@ -188,7 +188,7 @@
 	function um_profile_header_cover_area( $args ) {
 		if ($args['cover_enabled'] == 1) {
 
-			$default_cover = um_get_option( 'default_cover' );
+			$default_cover = UM()->options()->get( 'default_cover' );
 
 			$overlay = '<span class="um-cover-overlay">
 				<span class="um-cover-overlay-s">
@@ -391,7 +391,7 @@
 						<?php
 
 							$description = get_user_meta( um_user( 'ID' ), 'description', true );
-							if (um_get_option( 'profile_show_html_bio' )) : ?>
+							if ( UM()->options()->get( 'profile_show_html_bio' ) ) : ?>
 								<?php echo make_clickable( wpautop( wp_kses_post( $description ) ) ); ?>
 							<?php else : ?>
 								<?php echo esc_html( $description ); ?>
@@ -402,14 +402,14 @@
 
                     <div class="um-meta-text">
                         <textarea id="um-meta-bio"
-                                  data-character-limit="<?php echo um_get_option( 'profile_bio_maxchars' ); ?>"
+                                  data-character-limit="<?php echo UM()->options()->get( 'profile_bio_maxchars' ); ?>"
                                   placeholder="<?php _e( 'Tell us a bit about yourself...', 'ultimate-member' ); ?>"
                                   name="<?php echo 'description-' . $args['form_id']; ?>"
                                   id="<?php echo 'description-' . $args['form_id']; ?>"><?php if (um_user( 'description' )) {
 								echo um_user( 'description' );
 							} ?></textarea>
                         <span class="um-meta-bio-character um-right"><span
-                                    class="um-bio-limit"><?php echo um_get_option( 'profile_bio_maxchars' ); ?></span></span>
+                                    class="um-bio-limit"><?php echo UM()->options()->get( 'profile_bio_maxchars' ); ?></span></span>
 						<?php
 							if (UM()->fields()->is_error( 'description' )) {
 								echo UM()->fields()->field_error( UM()->fields()->show_error( 'description' ), true );
@@ -621,7 +621,7 @@
 	 ***/
 	add_action( 'um_profile_menu', 'um_profile_menu', 9 );
 	function um_profile_menu( $args ) {
-		if (!um_get_option( 'profile_menu' ))
+		if ( ! UM()->options()->get( 'profile_menu' ) )
 			return;
 
 		// get active tabs
@@ -643,7 +643,7 @@
 		}
 
 		// Move default tab priority
-		$default_tab = um_get_option( 'profile_menu_default_tab' );
+		$default_tab = UM()->options()->get( 'profile_menu_default_tab' );
 		$dtab = ( isset( $tabs[$default_tab] ) ) ? $tabs[$default_tab] : 'main';
 		if (isset( $tabs[$default_tab] )) {
 			unset( $tabs[$default_tab] );
@@ -668,12 +668,12 @@
 
 				?>
 
-                <div class="um-profile-nav-item um-profile-nav-<?php echo $id; ?> <?php if (!um_get_option( 'profile_menu_icons' )) {
+                <div class="um-profile-nav-item um-profile-nav-<?php echo $id; ?> <?php if ( ! UM()->options()->get( 'profile_menu_icons' ) ) {
 					echo 'without-icon';
 				} ?> <?php if ($id == $active_tab) {
 					echo 'active';
 				} ?>">
-					<?php if (um_get_option( 'profile_menu_icons' )) { ?>
+					<?php if ( UM()->options()->get( 'profile_menu_icons' ) ) { ?>
                         <a href="<?php echo $nav_link; ?>" class="um-tip-n uimob500-show uimob340-show uimob800-show"
                            title="<?php echo $tab['name']; ?>" original-title="<?php echo $tab['name']; ?>">
 
diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php
index bb5b7b01..b3a9b8e3 100644
--- a/includes/core/um-actions-register.php
+++ b/includes/core/um-actions-register.php
@@ -155,11 +155,11 @@
 
 		if ( ! empty( $first_name ) && ! empty( $last_name ) && ! isset( $user_login ) ) {
 
-			if ( um_get_option( 'permalink_base' ) == 'name' ) {
+			if ( UM()->options()->get( 'permalink_base' ) == 'name' ) {
 				$user_login = rawurlencode( strtolower( str_replace( " ", ".", $first_name . " " . $last_name ) ) );
-			} elseif ( um_get_option( 'permalink_base' ) == 'name_dash' ) {
+			} elseif ( UM()->options()->get( 'permalink_base' ) == 'name_dash' ) {
 				$user_login = rawurlencode( strtolower( str_replace( " ", "-", $first_name . " " . $last_name ) ) );
-			} elseif ( um_get_option( 'permalink_base' ) == 'name_plus' ) {
+			} elseif ( UM()->options()->get( 'permalink_base' ) == 'name_plus' ) {
 				$user_login = strtolower( str_replace( " ", "+", $first_name . " " . $last_name ) );
 			} else {
 				$user_login = strtolower( str_replace( " ", "", $first_name . " " . $last_name ) );
@@ -236,7 +236,6 @@
 		if ( ! empty( $args['role'] ) && $use_custom_settings ) {
 			$role = $args['role'];
 		} else if( ! $use_custom_settings ) {
-			//$role = um_get_option('default_role');
 			$role = get_option( 'default_role' );
 		}
 
diff --git a/includes/core/um-actions-save-profile.php b/includes/core/um-actions-save-profile.php
index c4329b5b..b54e1b60 100644
--- a/includes/core/um-actions-save-profile.php
+++ b/includes/core/um-actions-save-profile.php
@@ -6,7 +6,7 @@
 	add_action( 'um_update_profile_full_name', 'um_update_profile_full_name' );
 	function um_update_profile_full_name( $changes ) {
 		// Sync display name changes
-		$option = um_get_option( 'display_name' );
+		$option = UM()->options()->get( 'display_name' );
 		
 		$user_id = UM()->user()->id;
 
diff --git a/includes/core/um-actions-wpadmin.php b/includes/core/um-actions-wpadmin.php
index dbf8dba2..b9db417c 100644
--- a/includes/core/um-actions-wpadmin.php
+++ b/includes/core/um-actions-wpadmin.php
@@ -1,98 +1,4 @@
 <?php
-
-	/***
-	***	@redirect wp-admin for non guests
-	***/
-/*	add_action( 'init', 'um_block_wpadmin_for_guests' );
-	function um_block_wpadmin_for_guests() {
-		global $pagenow;
-		
-
-
-		if ( isset( $_REQUEST['um_panic_key'] ) &&  $_REQUEST['um_panic_key'] == um_get_option('panic_key') ) {
-			exit( wp_redirect( add_query_arg('_verified_key', $_REQUEST['um_panic_key'], wp_login_url() ) ) );
-		}
-		
-		if ( !isset( $_REQUEST['_verified_key'] ) || $_REQUEST['_verified_key'] != um_get_option('panic_key') ) {
-			// Logout screen
-			if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && is_user_logged_in() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'logout' ) {
-				$redirect = um_get_core_page('logout');
-
-				if ( isset( $_REQUEST['redirect_to'] ) && !empty( $_REQUEST['redirect_to'] ) ) {
-					$redirect = add_query_arg( 'redirect_to', esc_url( $_REQUEST['redirect_to'] ), $redirect );
-				}
-				
-				
-				
-				exit( wp_redirect( $redirect ) );
-			}
-				
-			// Login screen
-			if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && !is_user_logged_in() && !isset( $_REQUEST['action'] ) ) {
-
-				$allowed = um_get_option('wpadmin_login');
-				$allowed = apply_filters('um_whitelisted_wpadmin_access', $allowed );
-				
-				if ( !$allowed ) {
-					
-					$act = um_get_option('wpadmin_login_redirect');
-					$custom_url = um_get_option('wpadmin_login_redirect_url');
-					
-					if ( $act == 'um_login_page' || !$custom_url ) {
-						$redirect = um_get_core_page('login');
-					} else {
-						$redirect = $custom_url;
-					}
-					
-					//Add support query string data after user login
-					if($_SERVER['QUERY_STRING']) {
-						$redirect .= '?'.$_SERVER['QUERY_STRING'];
-					}
-
-					exit( wp_redirect( $redirect ) );
-				}
-			}
-
-			// Register screen
-			if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && !is_user_logged_in() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'register' ) {
-				
-				$allowed = um_get_option('wpadmin_register');
-				$allowed = apply_filters('um_whitelisted_wpadmin_access', $allowed );
-				
-				if ( !$allowed ) {
-					
-					$act = um_get_option('wpadmin_register_redirect');
-					$custom_url = um_get_option('wpadmin_register_redirect_url');
-					
-					if ( $act == 'um_register_page' || !$custom_url ) {
-						$redirect = um_get_core_page('register');
-					} else {
-						$redirect = $custom_url;
-					}
-					exit( wp_redirect( $redirect ) );
-				}
-			}
-		
-			// Lost password page
-			if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'lostpassword' ) {
-				exit( wp_redirect( um_get_core_page('password-reset') ) );
-			}
-
-			// Prevention for logged in user
-			if ( isset( $pagenow ) && $pagenow == 'wp-login.php' && is_user_logged_in() && isset(  $_REQUEST['action'] ) && $_REQUEST['action'] != 'postpass' ) {
-				
-				if ( ! um_user( 'can_access_wpadmin' ) ) {
-					exit( wp_redirect( home_url() ) );
-				} else {
-					exit( wp_redirect( admin_url() ) );
-				}
-			
-			}
-		
-		}
-
-		
-	}*/
 	
 	/***
 	***	@checks if user can access the backend
diff --git a/includes/core/um-filters-account.php b/includes/core/um-filters-account.php
index f648721a..dd2e7382 100644
--- a/includes/core/um-filters-account.php
+++ b/includes/core/um-filters-account.php
@@ -32,7 +32,7 @@
 	add_filter("um_get_field__first_name","um_account_disable_name_fields", 10 ,1 );
 	add_filter("um_get_field__last_name","um_account_disable_name_fields", 10 ,1 );
 	function um_account_disable_name_fields( $fields ){
-		if( ! um_get_option("account_name_disable") ) return $fields;
+		if( ! UM()->options()->get( "account_name_disable" ) ) return $fields;
 
 		if( um_is_core_page("account") ){
 			$fields['disabled'] = 'disabled="disabled"';
diff --git a/includes/core/um-filters-avatars.php b/includes/core/um-filters-avatars.php
index c9925c08..8687449d 100644
--- a/includes/core/um-filters-avatars.php
+++ b/includes/core/um-filters-avatars.php
@@ -38,7 +38,7 @@
 
 		$image_alt = apply_filters("um_avatar_image_alternate_text",  um_user("display_name") );
 
-		if ( ! $avatar && um_get_option('use_gravatars') ) {
+		if ( ! $avatar && UM()->options()->get( 'use_gravatars' ) ) {
 			
 			$default = get_option( 'avatar_default', 'mystery' );
 			if ( $default == 'gravatar_default' ) {
@@ -50,17 +50,17 @@
 				$rating = "&amp;r={$rating}";
 			}
 			
-			if( um_get_option('use_gravatars') && ! um_user('synced_profile_photo') && ! $has_profile_photo ){
+			if ( UM()->options()->get('use_gravatars') && ! um_user('synced_profile_photo') && ! $has_profile_photo ){
 						$avatar_url  = um_get_domain_protocol().'gravatar.com/avatar/'.um_user('synced_gravatar_hashed_id');
 						$avatar_url = add_query_arg('s',400, $avatar_url);
-						$gravatar_type = um_get_option('use_um_gravatar_default_builtin_image');
+						$gravatar_type = UM()->options()->get( 'use_um_gravatar_default_builtin_image' );
 						
-						if( $gravatar_type == 'default' ){
-							if( um_get_option('use_um_gravatar_default_image') ){
+						if ( $gravatar_type == 'default' ) {
+							if ( UM()->options()->get( 'use_um_gravatar_default_image' ) ) {
 								$avatar_url = add_query_arg('d', um_get_default_avatar_uri(), $avatar_url  );
 							}
-						}else{
-								$avatar_url = add_query_arg('d', $gravatar_type, $avatar_url  );
+						} else {
+							$avatar_url = add_query_arg('d', $gravatar_type, $avatar_url  );
 						}
 						
 			}
diff --git a/includes/core/um-filters-fields.php b/includes/core/um-filters-fields.php
index 664e863b..47e68c0c 100644
--- a/includes/core/um-filters-fields.php
+++ b/includes/core/um-filters-fields.php
@@ -6,7 +6,7 @@
 	add_filter('um_edit_label_all_fields', 'um_edit_label_all_fields', 10, 2);
 	function um_edit_label_all_fields( $label, $data ) {
 
-		$asterisk = um_get_option('form_asterisk');
+		$asterisk = UM()->options()->get( 'form_asterisk' );
 		if ( $asterisk && isset( $data['required'] ) && $data['required'] == 1 )
 			$label = $label . '<span class="um-req" title="'.__('Required','ultimate-member').'">*</span>';
 
@@ -321,7 +321,7 @@
 	add_filter('um_profile_field_filter_hook__','um_force_utf8_fields',1,10);
 	function um_force_utf8_fields( $value ){
 
-		if( ! um_get_option('um_force_utf8_strings') )
+		if( ! UM()->options()->get('um_force_utf8_strings') )
 			return $value;
 
 		$value = um_force_utf8_string( $value );
@@ -339,7 +339,7 @@
 	add_filter('um_is_selected_filter_value','um_is_selected_filter_value',1,9);
 	add_filter('um_select_dropdown_dynamic_option_value','um_is_selected_filter_value',1,10);
 	function um_is_selected_filter_value( $value ){
-		if( ! um_get_option('um_force_utf8_strings') )
+		if ( ! UM()->options()->get('um_force_utf8_strings') )
 			return $value;
 
 		$value = um_force_utf8_string( $value );
@@ -356,7 +356,7 @@
 	 */
 	add_filter('um_select_dropdown_dynamic_options','um_select_dropdown_dynamic_options_to_utf8',2,10);
 	function um_select_dropdown_dynamic_options_to_utf8( $options, $data ){
-		if( ! um_get_option('um_force_utf8_strings') )
+		if ( ! UM()->options()->get( 'um_force_utf8_strings' ) )
 			return $options;
 
 		foreach ( $options as $key => $value ) {
diff --git a/includes/core/um-filters-language.php b/includes/core/um-filters-language.php
index 292a8077..09687f94 100644
--- a/includes/core/um-filters-language.php
+++ b/includes/core/um-filters-language.php
@@ -45,7 +45,7 @@ function um_core_page_wpml_permalink( $array ){
 	if( ! function_exists('icl_object_id') ) return $array;
 
 	// Permalink base
-	$permalink_base = um_get_option('permalink_base');
+	$permalink_base = UM()->options()->get( 'permalink_base' );
 
 	// Get user slug
 	$profile_slug = get_user_meta( um_profile_id(), "um_user_profile_url_slug_{$permalink_base}", true );
diff --git a/includes/core/um-filters-login.php b/includes/core/um-filters-login.php
index fae5b42a..1a29a6ad 100644
--- a/includes/core/um-filters-login.php
+++ b/includes/core/um-filters-login.php
@@ -6,7 +6,7 @@
 	add_filter('um_whitelisted_wpadmin_access', 'um_whitelisted_wpadmin_access');
 	function um_whitelisted_wpadmin_access( $allowed ) {
 
-		$ips = um_get_option('wpadmin_allow_ips');
+		$ips = UM()->options()->get( 'wpadmin_allow_ips' );
 		
 		if ( !$ips )
 			return $allowed;
diff --git a/includes/core/um-filters-members.php b/includes/core/um-filters-members.php
index 62416c62..942f8666 100644
--- a/includes/core/um-filters-members.php
+++ b/includes/core/um-filters-members.php
@@ -48,7 +48,7 @@
 
 		}
 
-		if ( ! UM()->roles()->um_user_can( 'can_edit_everyone' ) || um_get_option('account_hide_in_directory') ) {
+		if ( ! UM()->roles()->um_user_can( 'can_edit_everyone' ) || UM()->options()->get( 'account_hide_in_directory' ) ) {
 			$query_args['meta_query'][] = array(
 				"relation"	=> "OR",
 				array(
@@ -174,7 +174,7 @@
 
 		// must have a profile photo
 		if ( $has_profile_photo == 1 ) {
-			if ( um_get_option( 'use_gravatars' ) ) {
+			if ( UM()->options()->get( 'use_gravatars' ) ) {
 				$query_args['meta_query'][] = array(
 					'relation' => 'OR',
 					array(
diff --git a/includes/core/um-filters-profile.php b/includes/core/um-filters-profile.php
index acfcb97e..e409f1e0 100644
--- a/includes/core/um-filters-profile.php
+++ b/includes/core/um-filters-profile.php
@@ -7,7 +7,7 @@
 	add_filter('pre_get_document_title', 'um_dynamic_user_profile_pagetitle', 100000, 2 );
 	function um_dynamic_user_profile_pagetitle( $title, $sep = '' ) {
 
-		$profile_title = um_get_option('profile_title');
+		$profile_title = UM()->options()->get( 'profile_title' );
 
 		if ( um_is_core_page('user') && um_get_requested_user() ) {
 
diff --git a/includes/core/um-filters-user.php b/includes/core/um-filters-user.php
index 8f3a1e86..efc1bc99 100644
--- a/includes/core/um-filters-user.php
+++ b/includes/core/um-filters-user.php
@@ -62,7 +62,7 @@
 	 */
 	add_filter('um_clean_user_basename_filter','um_clean_user_basename_filter',2,10);
 	function um_clean_user_basename_filter( $value, $raw ){
-		$permalink_base = um_get_option('permalink_base');
+		$permalink_base = UM()->options()->get( 'permalink_base' );
 		
 		$user_query = new WP_User_Query(
 				array(
@@ -173,7 +173,7 @@
 	 */
 	add_filter('um_before_update_profile','um_before_update_profile',2,10);
 	function um_before_update_profile( $changes, $user_id ){
-		if( ! um_get_option('um_force_utf8_strings') )
+		if( ! UM()->options()->get( 'um_force_utf8_strings' ) )
 			return $changes;
 
 		foreach( $changes as $key => $value ) {
diff --git a/includes/core/um-navmenu.php b/includes/core/um-navmenu.php
index a8958601..5d73c266 100644
--- a/includes/core/um-navmenu.php
+++ b/includes/core/um-navmenu.php
@@ -5,7 +5,7 @@ if ( ! class_exists( 'UM_Menu_Item_Custom_Fields' ) ) :
 	class UM_Menu_Item_Custom_Fields {
 
 		public static function load() {
-			if ( um_get_option('disable_menu') == 0 ) {
+			if ( UM()->options()->get( 'disable_menu' ) == 0 ) {
 				add_filter( 'wp_edit_nav_menu_walker', array( __CLASS__, '_filter_walker' ), 99 );
 			}
 		}
diff --git a/includes/lib/upload/um-image-upload.php b/includes/lib/upload/um-image-upload.php
index 6bf1397d..2e8da2a6 100644
--- a/includes/lib/upload/um-image-upload.php
+++ b/includes/lib/upload/um-image-upload.php
@@ -56,7 +56,7 @@ if(isset($_FILES[$id]['name'])) {
 		
 		} else {
 			$file = "stream_photo_".md5($file)."_".uniqid().".".$ext;
-			$ret[ ] = UM()->files()->new_image_upload_temp( $temp, $file, um_get_option('image_compression') );
+			$ret[ ] = UM()->files()->new_image_upload_temp( $temp, $file, UM()->options()->get('image_compression') );
 			
 		}
 
diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php
index d718bc6f..1ccfc2db 100644
--- a/includes/um-short-functions.php
+++ b/includes/um-short-functions.php
@@ -166,7 +166,7 @@
 			um_user( '_um_cool_but_hard_to_guess_plain_pw' ),
 			um_get_core_page( 'login' ),
 			um_dynamic_login_page_redirect(),
-			um_get_option( 'site_name' ),
+			UM()->options()->get( 'site_name' ),
 			get_bloginfo( 'url' ),
 			um_user( 'account_activation_link' ),
 			um_user( 'password_reset_link' ),
@@ -829,15 +829,15 @@
 		$core_form_meta_all = UM()->config()->core_form_meta_all;
 		$core_global_meta_all = UM()->config()->core_global_meta_all;
 
-		foreach ($core_form_meta_all as $k => $v) {
+		foreach ( $core_form_meta_all as $k => $v ) {
 			$s = str_replace( $mode . '_', '', $k );
 			if (strstr( $k, '_um_' . $mode . '_' ) && !in_array( $s, $core_global_meta_all )) {
 				$a = str_replace( '_um_' . $mode . '_', '', $k );
 				$b = str_replace( '_um_', '', $k );
-				$new_arr[$a] = um_get_option( $b );
+				$new_arr[$a] = UM()->options()->get( $b );
 			} else if (in_array( $k, $core_global_meta_all )) {
 				$a = str_replace( '_um_', '', $k );
-				$new_arr[$a] = um_get_option( $a );
+				$new_arr[$a] = UM()->options()->get( $a );
 			}
 		}
 
@@ -1140,7 +1140,7 @@
 	 ***    @short for admin e-mail
 	 ***/
 	function um_admin_email() {
-		return um_get_option( 'admin_email' );
+		return UM()->options()->get( 'admin_email' );
 	}
 
 	/**
@@ -1383,7 +1383,7 @@
 
 		} else {
 
-			$sizes = um_get_option( 'photo_thumb_sizes' );
+			$sizes = UM()->options()->get( 'photo_thumb_sizes' );
 			if (is_array( $sizes )) $find = um_closest_num( $sizes, $attrs );
 
 			if (file_exists( UM()->files()->upload_basedir . um_user( 'ID' ) . "/profile_photo-{$find}{$ext}" )) {
@@ -1412,7 +1412,7 @@
 	 * @return string
 	 */
 	function um_get_default_avatar_uri() {
-		$uri = um_get_option( 'default_avatar' );
+		$uri = UM()->options()->get( 'default_avatar' );
 		$uri = !empty( $uri['url'] ) ? $uri['url'] : '';
 		if ( ! $uri ) {
 			$uri = um_url . 'assets/img/default_avatar.jpg';
@@ -1449,7 +1449,7 @@
 	 ***    @default cover
 	 ***/
 	function um_get_default_cover_uri() {
-		$uri = um_get_option( 'default_cover' );
+		$uri = UM()->options()->get( 'default_cover' );
 		$uri = !empty( $uri['url'] ) ? $uri['url'] : '';
 		if ($uri) {
 			$uri = apply_filters( 'um_get_default_cover_uri_filter', $uri );
@@ -1498,7 +1498,7 @@
 
 				$name = um_profile( $data );
 
-				if (um_get_option( 'force_display_name_capitlized' )) {
+				if ( UM()->options()->get( 'force_display_name_capitlized' ) ) {
 					$name = implode( '-', array_map( 'ucfirst', explode( '-', $name ) ) );
 				}
 
@@ -1540,7 +1540,7 @@
 
 				$f_and_l_initial = UM()->validation()->safe_name_in_url( $f_and_l_initial );
 
-				if (um_get_option( 'force_display_name_capitlized' )) {
+				if ( UM()->options()->get( 'force_display_name_capitlized' ) ) {
 					$name = implode( '-', array_map( 'ucfirst', explode( '-', $f_and_l_initial ) ) );
 				} else {
 					$name = $f_and_l_initial;
@@ -1552,7 +1552,7 @@
 
 			case 'display_name':
 
-				$op = um_get_option( 'display_name' );
+				$op = UM()->options()->get( 'display_name' );
 
 				$name = '';
 
@@ -1615,8 +1615,8 @@
 				}
 
 
-				if ($op == 'field' && um_get_option( 'display_name_field' ) != '') {
-					$fields = array_filter( preg_split( '/[,\s]+/', um_get_option( 'display_name_field' ) ) );
+				if ($op == 'field' && UM()->options()->get( 'display_name_field' ) != '') {
+					$fields = array_filter( preg_split( '/[,\s]+/', UM()->options()->get( 'display_name_field' ) ) );
 					$name = '';
 
 					foreach ($fields as $field) {
@@ -1629,7 +1629,7 @@
 					}
 				}
 
-				if (um_get_option( 'force_display_name_capitlized' )) {
+				if ( UM()->options()->get( 'force_display_name_capitlized' ) ) {
 					$name = implode( '-', array_map( 'ucfirst', explode( '-', $name ) ) );
 				}
 
@@ -1680,14 +1680,14 @@
 				if (!$avatar_uri)
 					return '';
 
-				if (um_get_option( 'use_gravatars' ) && !um_user( 'synced_profile_photo' ) && !$has_profile_photo) {
+				if ( UM()->options()->get( 'use_gravatars' ) && !um_user( 'synced_profile_photo' ) && !$has_profile_photo) {
 					$avatar_hash_id = get_user_meta( um_user( 'ID' ), 'synced_gravatar_hashed_id', true );
 					$avatar_uri = um_get_domain_protocol() . 'gravatar.com/avatar/' . $avatar_hash_id;
 					$avatar_uri = add_query_arg( 's', 400, $avatar_uri );
-					$gravatar_type = um_get_option( 'use_um_gravatar_default_builtin_image' );
+					$gravatar_type = UM()->options()->get( 'use_um_gravatar_default_builtin_image' );
 					$photo_type = 'um-avatar-gravatar';
-					if ($gravatar_type == 'default') {
-						if (um_get_option( 'use_um_gravatar_default_image' )) {
+					if ( $gravatar_type == 'default' ) {
+						if ( UM()->options()->get( 'use_um_gravatar_default_image' ) ) {
 							$avatar_uri = add_query_arg( 'd', um_get_default_avatar_uri(), $avatar_uri );
 						}
 					} else {
diff --git a/templates/account.php b/templates/account.php
index 82a9aa35..c30c39b6 100644
--- a/templates/account.php
+++ b/templates/account.php
@@ -6,7 +6,7 @@
 			
 			<?php do_action( 'um_account_page_hidden_fields', $args ); ?>
 
-            <div class="um-account-meta radius-<?php echo um_get_option( 'profile_photocorner' ); ?> uimob340-show uimob500-show">
+            <div class="um-account-meta radius-<?php echo UM()->options()->get( 'profile_photocorner' ); ?> uimob340-show uimob500-show">
 
                 <div class="um-account-meta-img">
                     <a href="<?php echo um_user_profile_url(); ?>"><?php echo get_avatar( um_user('ID'), 120 ); ?></a>
@@ -23,7 +23,7 @@
 			
 			<div class="um-account-side uimob340-hide uimob500-hide">
 
-                <div class="um-account-meta radius-<?php echo um_get_option('profile_photocorner'); ?>">
+                <div class="um-account-meta radius-<?php echo UM()->options()->get('profile_photocorner'); ?>">
 
                     <div class="um-account-meta-img uimob800-hide"><a href="<?php echo um_user_profile_url(); ?>"><?php echo get_avatar( um_user('ID'), 120 ); ?></a></div>
 
@@ -46,7 +46,7 @@
 
 				<ul>
 					<?php foreach ( UM()->account()->tabs as $id => $info ) {
-                        if ( isset( $info['custom'] ) || um_get_option( "account_tab_{$id}" ) == 1 || $id == 'general' ) { ?>
+                        if ( isset( $info['custom'] ) || UM()->options()->get( "account_tab_{$id}" ) == 1 || $id == 'general' ) { ?>
 
                             <li>
                                 <a data-tab="<?php echo $id ?>" href="<?php echo UM()->account()->tab_link( $id ); ?>" class="um-account-link <?php if ( $id == UM()->account()->current_tab ) echo 'current'; ?>">
@@ -77,7 +77,7 @@
 
                     $current_tab = UM()->account()->current_tab;
 
-                    if ( isset( $info['custom'] ) || um_get_option( 'account_tab_' . $id ) == 1 || $id == 'general' ) { ?>
+                    if ( isset( $info['custom'] ) || UM()->options()->get( 'account_tab_' . $id ) == 1 || $id == 'general' ) { ?>
 
                         <div class="um-account-nav uimob340-show uimob500-show">
                             <a href="#" data-tab="<?php echo $id; ?>" class="<?php if ( $id == $current_tab ) echo 'current'; ?>">
diff --git a/templates/members-grid.php b/templates/members-grid.php
index 21c7a625..6a9acbe3 100644
--- a/templates/members-grid.php
+++ b/templates/members-grid.php
@@ -10,7 +10,7 @@
 					
 		<?php
 		if ($cover_photos) {
-			$sizes = um_get_option('cover_thumb_sizes');
+			$sizes = UM()->options()->get('cover_thumb_sizes');
 			if ( UM()->mobile()->isTablet() ) {
 				$cover_size = $sizes[1];
 			} else {
@@ -18,15 +18,15 @@
 			}
 		?>
 
-		<div class="um-member-cover" data-ratio="<?php echo um_get_option('profile_cover_ratio'); ?>">
+		<div class="um-member-cover" data-ratio="<?php echo UM()->options()->get('profile_cover_ratio'); ?>">
 			<div class="um-member-cover-e"><a href="<?php echo um_user_profile_url(); ?>" title="<?php echo esc_attr(um_user('display_name')); ?>"><?php echo um_user('cover_photo', $cover_size); ?></a></div>
 		</div>
 
 		<?php } ?>
 		
 		<?php if ($profile_photo) {
-			$default_size = str_replace( 'px', '', um_get_option('profile_photosize') );
-			$corner = um_get_option('profile_photocorner');
+			$default_size = str_replace( 'px', '', UM()->options()->get('profile_photosize') );
+			$corner = UM()->options()->get('profile_photocorner');
 		?>
 		<div class="um-member-photo radius-<?php echo $corner; ?>"><a href="<?php echo um_user_profile_url(); ?>" title="<?php echo esc_attr(um_user('display_name')); ?>"><?php echo get_avatar( um_user('ID'), $default_size ); ?></a></div>
 		<?php } ?>
diff --git a/uninstall.php b/uninstall.php
index cd655a41..327c5064 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -24,12 +24,12 @@ remove_all_filters( 'um_core_pages' );
 require_once plugin_dir_path( __FILE__ ) . 'includes/class-functions.php';
 require_once plugin_dir_path( __FILE__ ) . 'includes/class-init.php';
 
-$delete_options = UM()->um_get_option( 'uninstall_on_delete' );
+$delete_options = UM()->options()->get( 'uninstall_on_delete' );
 if ( ! empty( $delete_options ) ) {
 
     //remove core pages
     foreach ( UM()->config()->core_pages as $page_key => $page_value ) {
-        $page_id = UM()->um_get_option( apply_filters( 'um_core_page_id_filter', 'core_' . $page_key ) );
+        $page_id = UM()->options()->get( apply_filters( 'um_core_page_id_filter', 'core_' . $page_key ) );
         if ( ! empty( $page_id ) )
             wp_delete_post( $page_id, true );
     }