diff --git a/drupal_commons.make b/drupal_commons.make
index f4bb025..79a3ce6 100644
--- a/drupal_commons.make
+++ b/drupal_commons.make
@@ -324,6 +324,12 @@ projects[digests][download][revision] = "6.x-1.x"
 projects[digests][type] = "module"
 projects[digests][subdir] = "contrib"
 
+projects[node_link_style][download][type] = "git"
+projects[node_link_style][download][url] = "http://git.drupal.org/project/node_link_style.git"
+projects[node_link_style][download][revision] = "6.x-1.x"
+projects[node_link_style][type] = "module"
+projects[node_link_style][subdir] = "contrib"
+
 projects[facebook_status][download][type] = "git"
 projects[facebook_status][download][url] = "http://git.drupal.org/project/facebook_status.git"
 projects[facebook_status][download][revision] = "6.x-3.x"
diff --git a/modules/features/commons_node_links/commons_node_links.features.inc b/modules/features/commons_node_links/commons_node_links.features.inc
new file mode 100644
index 0000000..b4eed7e
--- /dev/null
+++ b/modules/features/commons_node_links/commons_node_links.features.inc
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Implementation of hook_ctools_plugin_api().
+ */
+function commons_node_links_ctools_plugin_api() {
+  list($module, $api) = func_get_args();
+  if ($module == "node_link_style" && $api == "node_link_style") {
+    return array("version" => 1);
+  }
+}
diff --git a/modules/features/commons_node_links/commons_node_links.info b/modules/features/commons_node_links/commons_node_links.info
new file mode 100644
index 0000000..a9bc3fa
--- /dev/null
+++ b/modules/features/commons_node_links/commons_node_links.info
@@ -0,0 +1,7 @@
+core = "6.x"
+dependencies[] = "node_link_style"
+description = "Overrides default node links using node_links_style module"
+features[ctools][] = "node_link_style:node_link_style:1"
+features[node_link_style][] = "simple_style"
+name = "Commons Node Links"
+package = "Commons"
diff --git a/modules/features/commons_node_links/commons_node_links.module b/modules/features/commons_node_links/commons_node_links.module
new file mode 100644
index 0000000..fb7f308
--- /dev/null
+++ b/modules/features/commons_node_links/commons_node_links.module
@@ -0,0 +1,45 @@
+<?php
+
+include_once('commons_node_links.features.inc');
+
+/**
+ *
+ * Implements hook init
+ */
+function commons_node_links_init(){
+  $module_path = drupal_get_path('module', 'commons_node_links');
+  drupal_add_css($module_path . '/css/commons_node_links.css');
+}
+
+
+
+/**
+ * Implements hook_theme().
+ */
+function commons_node_links_theme() {
+  return array(
+    'commons_node_links_custom_group' => array(
+      'arguments' => array('list_name' => NULL, 'links' => array(), 'config' => array(), 'options' => array(), 'start' => TRUE),
+      'file' => 'commons_node_links.theme.inc',
+  ),
+    'commons_node_links_custom_group_item' => array(
+      'arguments' => array('links' => array(), 'config' => array(), 'options' => array()),
+      'file' => 'commons_node_links.theme.inc',
+  )
+  );
+}
+
+/**
+ * Implements hook_theme_registry_alter().
+ *
+ * Overrides node_link_style hooks.
+ *
+ */
+function commons_node_links_theme_registry_alter(&$theme_registry) {
+  if (isset($theme_registry['node_link_style_custom_group'])) {
+    $theme_registry['node_link_style_custom_group']['function'] = 'theme_commons_node_links_custom_group';
+  }
+  if (isset($theme_registry['node_link_style_custom_group'])) {
+    $theme_registry['node_link_style_custom_group_item']['function'] = 'theme_commons_node_links_custom_group_item';
+  }
+}
diff --git a/modules/features/commons_node_links/commons_node_links.node_link_style.inc b/modules/features/commons_node_links/commons_node_links.node_link_style.inc
new file mode 100644
index 0000000..df82edd
--- /dev/null
+++ b/modules/features/commons_node_links/commons_node_links.node_link_style.inc
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Implementation of hook_node_link_style_default_styles().
+ */
+function commons_node_links_node_link_style_default_styles() {
+  $export = array();
+  $style = new stdClass;
+  $style->disabled = FALSE; /* Edit this to true to make a default style disabled initially */
+  $style->api_version = 1;
+  $style->name = 'simple_style';
+  $style->settings = array(
+    'links' => array(
+      'comment_add' => array(
+        'show' => 1,
+        'title' => 'Comment',
+        'element' => 'div',
+        'class' => 'comment_clear_style',
+        'apply_attributes' => 0,
+        'info' => array(
+          'label' => 'Add comment',
+        ),
+        'weight' => '-50',
+      ),
+      'notifications__' => array(
+        'show' => 1,
+        'group_element' => 'div',
+        'group_class' => 'subscription_clear_style',
+        'list_element' => 'custom',
+        'list_class' => '',
+        'element' => '0',
+        'class' => '',
+        'apply_attributes' => 0,
+        'info' => array(
+          'label' => 'Subscription links',
+          'group' => TRUE,
+        ),
+        'weight' => '-50',
+      ),
+    ),
+  );
+
+  $export['simple_style'] = $style;
+  return $export;
+}
diff --git a/modules/features/commons_node_links/commons_node_links.theme.inc b/modules/features/commons_node_links/commons_node_links.theme.inc
new file mode 100644
index 0000000..7c8098a
--- /dev/null
+++ b/modules/features/commons_node_links/commons_node_links.theme.inc
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @file
+ * node_link_style overriden theme hook
+ */
+
+/**
+ * Overrides theme function for Custom list in node_link_style module
+ * @return
+ *   HTML for drop down group item.
+ *
+ * @ingroup themeable
+ */
+function theme_commons_node_links_custom_group_item($link,$config,$options) {
+  $output = '';
+  $list_name=$options['list_name'];
+  $first=$options['first'];
+  $last=$options['last'];
+
+  $title_tag=_get_title($link,$config);
+  if ($first){
+    $output.='<li class="node_link_style-dropdown-main">';
+    $title_tag='<span>'.$title_tag.'</span>';
+  }
+  else $output.='<li class="node_link_style-dropdown-item">';
+  $output.=l($title_tag, $link['href'], $link);
+  if (!$first) $output.='</li>';
+  if ($first && !$last) $output.='<ul>';
+  else if ($last && !$first) $output.='</ul>';
+  if ($last) $output.='</li>';
+
+  return $output;
+}
+
+/**
+ * Overrides theme function for Custom list in node_link_style module
+ * @return
+ *   HTML for drop down group.
+ *
+ * @ingroup themeable
+ */
+function theme_commons_node_links_custom_group($list_name,$link,$config,$options,$start=TRUE) {
+  $output = '';
+  if ($start){
+    $drop_down_form_name='drop_down_form_'.$list_name;
+    $drop_down_input_name='drop_down_input_'.$list_name;
+     
+    $output.='<div class="subscription_clear_style">';
+    $output.='<ul class="node_link_style-dropdown">';
+
+  }else{
+    $output.='</ul>';
+    $output.='</div>';
+  }
+  return $output;
+}
+
+
diff --git a/modules/features/commons_node_links/css/commons_node_links.css b/modules/features/commons_node_links/css/commons_node_links.css
new file mode 100644
index 0000000..c73c37a
--- /dev/null
+++ b/modules/features/commons_node_links/css/commons_node_links.css
@@ -0,0 +1,118 @@
+/*Node Links Style*/
+/*Temporary until a better fix is found. This code should be in its own css but included after theme css*/
+.node .inner .links .comment_clear_style {
+	float: left;
+	background-color: #6699CC;
+	border-color: #6699CC;
+	border-style: solid;
+	border-width: 0 1px 1px 0;
+	padding: 7px 17px;
+}
+
+.node .inner .links .comment_clear_style a {
+	color: white;
+	font-family: "Helvetica Neue", Helvetica, Arial, Sans-serif;
+	font-size: 12px;
+}
+
+.node .inner .links .subscription_clear_style {
+	float: right;
+	width: 400px;
+	border: 0;
+	border-style: none;
+}
+
+.node .inner .links .styled-links-separator {
+	clear: both;
+}
+
+/* all ul */
+.node .inner .links>.subscription_clear_style ul {
+	list-style: none;
+	background-color: #C2C2C2; /*used as border color*/
+	border-color: #C2C2C2;
+	margin: 0px;
+	padding: 0px 1px 1px 0px;
+	border-width: 0px;
+	border-style: solid;
+}
+
+/* primary ul */
+.node .inner .links>.subscription_clear_style ul.node_link_style-dropdown
+	{
+	display: block;
+	float: left;
+}
+
+/* secondary ul*/
+.node .inner .links>.subscription_clear_style ul.node_link_style-dropdown ul
+	{
+	display: none;
+	position: absolute;
+	left: -1px;
+	top: 98%;
+}
+
+/*all li */
+.node .inner .links>.subscription_clear_style ul.node_link_style-dropdown li
+	{
+	float: left;
+	display: block;
+	margin: 1px 0px 0px 1px;
+	font-size: 0px;
+	padding-left: 0px; /* remove padding set by theme */
+	background: none; /* remove background set by theme */
+	border-left: 0;
+	border-right: 0;
+}
+
+/* secondary li*/
+.node .inner .links>.subscription_clear_style ul.node_link_style-dropdown ul li
+	{
+	float: none;
+}
+
+/* all a*/
+.node .inner .links>.subscription_clear_style ul.node_link_style-dropdown a
+	{
+	display: block;
+	background-color: #DDE9F4;
+	border-color: #6699CC;
+	color: #6699CC;
+	border-width: 0px;
+	border-style: solid;
+	padding: 10px 10px 10px 17px;
+	font: normal 12px "Helvetica Neue", Helvetica, Arial, Sans-serif;
+	cursor: pointer;
+}
+/* selection highlight*/
+.node .inner .links>.subscription_clear_style ul.node_link_style-dropdown li:hover>a
+	{
+	background-color: #6699CC;
+	border-color: #6699CC;
+	border-style: solid;
+	color: white;
+	font: normal 12px "Helvetica Neue", Helvetica, Arial, Sans-serif;
+}
+
+/* all span*/
+.node .inner .links>.subscription_clear_style ul.node_link_style-dropdown span
+	{
+	overflow: hidden;
+	display: block;
+	background-image: url(../images/dropdown_arrow.png);
+	background-position: right center;
+	padding-right: 20px;
+	background-repeat: no-repeat;
+}
+
+/* li:hover */
+.node .inner .links>.subscription_clear_style ul.node_link_style-dropdown li:hover>ul
+	{
+	display: block
+}
+
+.node .inner .links>.subscription_clear_style ul.node_link_style-dropdown li:hover
+	{
+	position: relative; /* position just below title */
+}
diff --git a/modules/features/commons_node_links/images/dropdown_arrow.png b/modules/features/commons_node_links/images/dropdown_arrow.png
new file mode 100644
index 0000000..9470ce9
Binary files /dev/null and b/modules/features/commons_node_links/images/dropdown_arrow.png differ