diff --git a/sharethis.admin.inc b/sharethis.admin.inc
index 4944761..f1b218d 100644
--- a/sharethis.admin.inc
+++ b/sharethis.admin.inc
@@ -27,14 +27,10 @@ function sharethis_configuration_form($form, &$form_state) {
   // Create the variables related to services chosen.
   $service_string = $current_options_array['services'];
   $service_string_markup = "";
-  $enabled_services = array();
-  foreach (explode(",", $service_string) as $string) {
+  foreach (explode(",", $service_string) as $name => $string) {
     $key = explode(":", drupal_substr($string, 0, -1));
     $key = $key[1];
     $service_string_markup .= "\"" . $key . "\",";
-    // Store enabled services for custom overrides.
-    $service = explode(":", drupal_substr($string, 0, -1));
-    $enabled_services[$service[1]] = str_replace('"', '', $service[0]);
   }
   $service_string_markup = drupal_substr($service_string_markup, 0, -1);
 
@@ -336,21 +332,6 @@ function sharethis_configuration_form($form, &$form_state) {
     ),
     '#default_value' => $current_options_array['sharethis_cns'],
   );
-  $form['overrides'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Markup overrides'),
-    '#group' => 'additional_settings',
-    '#description' => t('Override span button markup to include SVGs or other markup.'),
-  );
-  foreach ($enabled_services as $key => $service) {
-    $current_value = variable_get('sharethis_override_' . $key, '');
-    // Add each enabled service to include markup.
-    $form['overrides']['override_' . $key] = array(
-      '#title' => $service,
-      '#type' => 'textfield',
-      '#default_value' => $current_value,
-    );
-  }
 
   $form['#submit'][] = 'sharethis_configuration_form_submit';
   return system_settings_form($form);
diff --git a/sharethis.module b/sharethis.module
index a1d6d94..8221a9d 100644
--- a/sharethis.module
+++ b/sharethis.module
@@ -58,16 +58,6 @@ function sharethis_configuration_form_submit($form, &$form_state) {
   if (($current_location == 'content' || $new_location == 'content') && $current_location != $new_location) {
     field_info_cache_clear();
   }
-  // Markup overrides for each enabled service.
-  $enabled_services = array();
-  foreach (explode(",", $form_state['values']['sharethis_service_option']) as $string) {
-    $service = explode(":", drupal_substr($string, 0, -1));
-    $enabled_services[$service[1]] = str_replace('"', '', $service[0]);
-  }
-  foreach ($enabled_services as $key => $service) {
-    $override = $form_state['values']['override_' . $key];
-    variable_set('sharethis_override_' . $key, $override);
-  }
 }
 
 /**
@@ -389,13 +379,12 @@ function theme_sharethis($variables) {
     if (!empty($type)) {
       $attributes['displayText'] = check_plain($display);
     }
-    $markup = variable_get('sharethis_override_' . $serviceCodeName, '');
     // Render the span tag.
     $st_spans .= theme('html_tag', array(
       'element' => array(
         '#tag' => 'span',
         '#attributes' => $attributes,
-        '#value' => $markup,
+        '#value' => '', // It's an empty span tag.
       ),
     ));
   }
@@ -437,9 +426,19 @@ function sharethis_include_js() {
     drupal_add_js($external, 'external');
 
     $stlight = sharethis_get_light_options($data_options);
+
+	if((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https')) {
+		$external = "https://ws.sharethis.com/button/buttons.js";
+	} else {
+		$external = "http://w.sharethis.com/button/buttons.js";
+	}
+
+    drupal_add_js($external, 'external');
+    
+    $stlight = get_stLight_options($data_options);
     $st_js = "if (typeof stLight !== 'undefined') { stLight.options($stlight); }";
     drupal_add_js($st_js, 'inline');
-
+    
     $has_run = TRUE;
   }
   return $has_run;