diff --git a/sass/cal.scss b/sass/cal.scss
index 924c048..58c3a6d 100644
--- a/sass/cal.scss
+++ b/sass/cal.scss
@@ -85,9 +85,14 @@
 				opacity:.7;
 			}
 			th.today{
+<<<<<<< HEAD
 <<<<<<< HEAD
 				background: $uc-ecw-month-bg;
 				color: $uc-ecw-month-color;  
+=======
+				background: $uc-shortcal-today-bg;
+				color: $uc-shortcal-today-color;
+>>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
 =======
 				background: $uc-shortcal-today-bg;
 				color: $uc-shortcal-today-color;
diff --git a/style.css b/style.css
index 63ec823..8e6cd95 100644
--- a/style.css
+++ b/style.css
@@ -6949,6 +6949,330 @@ button.close {
 - - - - - - - - - - - - - - - - - - - */
 #content {
   /* Make sure select elements fit in widgets */
+<<<<<<< HEAD
+=======
+}
+#content .widget {
+  overflow: hidden;
+  border: 1px solid transparent;
+  border-width: 1px;
+  border-color: #cccccc;
+  border-radius: 4px;
+  margin: 0 0 1.5em 0;
+  padding: 0;
+  background-color: white;
+  color: black;
+}
+#content .widget a {
+  color: #428bca;
+}
+#content .widget a:hover {
+  color: #2a6496;
+}
+#content .widget .widget-head {
+  border: 1px solid transparent;
+  padding: 0.5em 0.5em 0.5em 1em;
+  border-width: 0 0 1px 0;
+  border-color: #cccccc;
+}
+#content .widget .widget-head h2 {
+  margin: 0;
+  font-size: 1em;
+  color: black;
+}
+#content .widget form {
+  margin: 1em;
+}
+#content .widget ul,
+#content .widget ol {
+  list-style-type: none;
+  padding: 0;
+  margin: 1em;
+}
+#content .widget ul li,
+#content .widget ol li {
+  margin-bottom: .75em;
+}
+#content .widget ul li ul,
+#content .widget ol li ul {
+  padding: 0;
+  margin: .5em 0 .5em 2em;
+  list-style-type: disc;
+}
+#content .widget ul li ul li,
+#content .widget ol li ul li {
+  margin-bottom: .5em;
+}
+#content .widget ul li ul li ul,
+#content .widget ol li ul li ul {
+  list-style-type: circle;
+}
+#content .widget ul li ol,
+#content .widget ol li ol {
+  padding: 0;
+  margin: .5em 0 .5em 2em;
+  list-style-type: decimal;
+}
+#content .widget ul li ol li,
+#content .widget ol li ol li {
+  margin-bottom: .5em;
+}
+#content * html .widget.widget_dpe_fp_widget .dpe-flexible-posts li a {
+  height: 1%;
+}
+#content .widget select {
+  max-width: 100%;
+}
+#content .widget {
+  /* === CORE WP Widgets
+  */
+  /*	=== 3rd Party Widgets
+  */
+  /* 	=== UCONN Widgets
+  */
+}
+#content .widget.widget_text .textwidget {
+  margin: 1em;
+}
+#content .widget.widget_tag_cloud .tagcloud {
+  margin: 1em;
+}
+#content .widget.widget_black_studio_tinymce .textwidget {
+  margin: 1em;
+}
+#content .widget.widget_black_studio_tinymce ul li {
+  list-style-type: disc;
+}
+#content .widget.widget_black_studio_tinymce ol li {
+  list-style-type: decimal;
+}
+#content .widget.simple-social-icons ul {
+  margin: 0.5em !important;
+}
+#content .widget.simple-social-icons ul li {
+  margin: 0.5em !important;
+}
+#content .widget.simple-social-icons .social-bloglovin:before, #content .widget.simple-social-icons .social-dribbble:before, #content .widget.simple-social-icons .social-email:before, #content .widget.simple-social-icons .social-facebook:before, #content .widget.simple-social-icons .social-flickr:before, #content .widget.simple-social-icons .social-github:before, #content .widget.simple-social-icons .social-gplus:before, #content .widget.simple-social-icons .social-instagram:before, #content .widget.simple-social-icons .social-linkedin:before, #content .widget.simple-social-icons .social-pinterest:before, #content .widget.simple-social-icons .social-rss:before, #content .widget.simple-social-icons .social-stumbleupon:before, #content .widget.simple-social-icons .social-tumblr:before, #content .widget.simple-social-icons .social-twitter:before, #content .widget.simple-social-icons .social-vimeo:before, #content .widget.simple-social-icons .social-youtube:before {
+  display: none;
+  content: none;
+}
+#content .widget.widget_rcpt ul {
+  margin: 0;
+}
+#content .widget.widget_rcpt ul .rcpt_item_title {
+  padding: .5em 5% 0;
+  font-weight: bold;
+}
+#content .widget.widget_rcpt ul .rcpt_item_title .rcpt_item_image {
+  margin-left: -9%;
+  margin-bottom: 1em;
+  width: 117%;
+}
+#content .widget.widget_rcpt ul .rcpt_item_title .rcpt_item_image img {
+  width: 100%;
+}
+#content .widget.widget_rcpt ul .rcpt_item_excerpt {
+  margin: .5em 5% 1em;
+}
+#content .widget.widget_rcpt ul .rcpt_item_date {
+  margin: .5em 5% 1em;
+}
+#content .widget.widget_sp_image {
+  padding: 0;
+  border: none;
+  background-color: transparent;
+}
+#content .widget.widget_metaslider_widget {
+  padding: 0;
+  background-color: transparent;
+  border: none;
+}
+#content .widget.widget_dpe_fp_widget {
+  padding: 0;
+  background-color: transparent;
+}
+#content .widget.widget_dpe_fp_widget .dpe-flexible-posts li {
+  padding: 0.1em 0px 0.1em 0px;
+  display: block;
+  background-color: transparent;
+}
+#content .widget.widget_dpe_fp_widget .dpe-flexible-posts li a {
+  margin: 0;
+  position: relative;
+  display: inline-block;
+}
+#content .widget.widget_dpe_fp_widget .dpe-flexible-posts li a .attachment-thumbnail {
+  height: 60px;
+  width: 60px;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  float: left;
+}
+#content .widget.widget_dpe_fp_widget .dpe-flexible-posts li a .attachment-medium {
+  width: 48%;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  float: left;
+}
+#content .widget.widget_dpe_fp_widget .dpe-flexible-posts li a .attachment-large {
+  max-width: 100%;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  float: left;
+  clear: right;
+}
+#content .widget.widget_dpe_fp_widget .dpe-flexible-posts li a .title {
+  display: block;
+  position: relative;
+  font-size: 1em;
+  font-weight: normal;
+}
+#content .widget.widget_dpe_fp_widget .dpe-flexible-posts li a:after {
+  visibility: hidden;
+  display: block;
+  font-size: 0;
+  content: " ";
+  clear: both;
+  height: 0;
+}
+#content .widget.uc-contact-widget th {
+  white-space: nowrap;
+}
+#content .widget.uc-contact-widget td.uc-output-email {
+  word-break: break-all;
+}
+#content .widget.uc-contact-widget td.uc-output-more {
+  word-break: break-all;
+}
+#content .widget.uc-ecw {
+  /*- - - - - */
+  /**/
+  /**/
+  /**/
+}
+#content .widget.uc-ecw .uc-cal {
+  margin: 1em !important;
+  padding: 0 !important;
+}
+#content .widget.uc-ecw .uc-cal * {
+  margin: 0 !important;
+  padding: 0 !important;
+  border: 0 !important;
+  font-size: 100% !important;
+  font: inherit !important;
+  vertical-align: baseline !important;
+  background: none !important;
+  position: inherit !important;
+  width: auto !important;
+  height: auto !important;
+  color: inherit !important;
+  display: block !important;
+  box-shadow: none !important;
+  text-transform: none !important;
+  min-height: inherit !important;
+  border-radius: 0 !important;
+}
+#content .widget.uc-ecw .uc-cal-item {
+  margin: 1em 0 !important;
+}
+#content .widget.uc-ecw .uc-cal-item .uc-cal-event {
+  position: relative !important;
+  color: #428bca !important;
+  /*
+  
+  inherits color from the .uc-cal-event <a>, so the hovers text decorations work. 
+  
+  .uc-cal-event-title {
+  	@if $parent == "#mega-footer" {
+  		color:$megafooter-ecw-title-color !important;	
+  	} @else {
+  		color:$ecw-title-color !important;	
+  	}
+  }
+  
+  */
+}
+#content .widget.uc-ecw .uc-cal-item .uc-cal-event .uc-cal-event-date {
+  float: left !important;
+  position: relative !important;
+  top: 0;
+  color: inherit !important;
+}
+#content .widget.uc-ecw .uc-cal-item .uc-cal-event:hover {
+  color: inherit !important;
+}
+#content .widget.uc-ecw .uc-cal-item .uc-cal-event:hover .uc-cal-event-date {
+  color: inherit !important;
+}
+#content .widget.uc-ecw .uc-cal-item .uc-cal-event:after {
+  visibility: hidden !important;
+  display: block !important;
+  font-size: 0 !important;
+  content: " " !important;
+  clear: both !important;
+  height: 0 !important;
+}
+#content .widget.uc-ecw .uc-iconcal .uc-cal-list .uc-cal-item .uc-cal-event {
+  padding-left: 70px !important;
+}
+#content .widget.uc-ecw .uc-iconcal .uc-cal-list .uc-cal-item .uc-cal-event .uc-cal-event-date {
+  left: -70px;
+  margin-right: -55px !important;
+  width: 55px !important;
+}
+#content .widget.uc-ecw .uc-iconcal .uc-cal-list .uc-cal-item .uc-cal-event .uc-cal-event-date .uc-cal-event-month {
+  padding: 0.7em 0 0 !important;
+  border-width: 1px 1px 0 !important;
+  border-style: solid !important;
+  text-align: center !important;
+  font-size: 70% !important;
+  text-transform: uppercase !important;
+  letter-spacing: 1px !important;
+  border-color: #cccccc !important;
+  background-color: white !important;
+  color: inherit !important;
+}
+#content .widget.uc-ecw .uc-iconcal .uc-cal-list .uc-cal-item .uc-cal-event .uc-cal-event-date .uc-cal-event-day {
+  padding: 0 0 0.2em 0 !important;
+  border-width: 0 1px 1px !important;
+  border-style: solid !important;
+  text-align: center !important;
+  font-size: 130% !important;
+  border-color: #cccccc !important;
+  background-color: white !important;
+  color: inherit !important;
+}
+#content .widget.uc-ecw .uc-iconcal .uc-cal-list .uc-cal-item .uc-cal-event .uc-cal-event-time {
+  color: inherit !important;
+}
+#content .widget.uc-ecw .uc-iconcal .uc-cal-list .uc-cal-item .uc-cal-event:hover .uc-cal-event-month {
+  border-color: #cccccc !important;
+  background-color: white !important;
+  color: inherit !important;
+}
+#content .widget.uc-ecw .uc-iconcal .uc-cal-list .uc-cal-item .uc-cal-event:hover .uc-cal-event-day {
+  background-color: white !important;
+  color: inherit !important;
+}
+#content .widget.uc-ecw .uc-iconcal .uc-cal-list .uc-cal-item .uc-cal-event:hover .uc-cal-event-time {
+  color: #2a6496 !important;
+}
+#content .widget.uc-ecw .uc-listcal {
+  padding-left: 3.7em !important;
+}
+#content .widget.uc-ecw .uc-listcal .uc-cal-event-date {
+  width: 3.7em !important;
+  left: -3.7em !important;
+  margin-right: -3.7em !important;
+}
+#content .widget.uc-hours-widget caption {
+  padding: .5em;
+}
+
+img {
+  height: auto;
+  max-width: 100%;
+>>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
 }
 #content .widget {
   overflow: hidden;
@@ -6973,6 +7297,7 @@ button.close {
   border-width: 0 0 1px 0;
   border-color: #cccccc;
 }
+<<<<<<< HEAD
 #content .widget .widget-head h2 {
   margin: 0;
   font-size: 1em;
@@ -7396,6 +7721,9 @@ code {
 }
 
 =======
+>>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
+=======
+
 >>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
 /*	POSTS
 --------------------------------------------------------------*/
@@ -7544,6 +7872,7 @@ code {
   display: block;
   margin: 1em auto;
 <<<<<<< HEAD
+<<<<<<< HEAD
 }
 
 /* - - - - - - - - - - - - - - - - - - - 
@@ -7866,6 +8195,8 @@ object {
   font-size: 1em;
 =======
 >>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
+=======
+>>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
 }
 
 /* - - - - - - - - - - - - - - - - - - - 
@@ -8184,6 +8515,7 @@ q:before, table q:after {
   opacity: .7;
 }
 #events-table table tbody th.today {
+<<<<<<< HEAD
 <<<<<<< HEAD
   background: #ccc;
   color: #333;
@@ -8191,6 +8523,10 @@ q:before, table q:after {
   background: #cccccc;
   color: black;
 >>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
+=======
+  background: #cccccc;
+  color: black;
+>>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
 }
 #events-table table tbody td {
   border-top-width: 0;
@@ -8264,11 +8600,14 @@ body.sticky .ie8 #footers {
   /* Make sure select elements fit in widgets */
 }
 #mega-footer .widget {
+<<<<<<< HEAD
 <<<<<<< HEAD
   color: #333;
   background-color: transparent;
   border: none;
 =======
+=======
+>>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
   overflow: hidden;
   border: 1px solid transparent;
   border-width: 1px;
@@ -8278,6 +8617,9 @@ body.sticky .ie8 #footers {
   padding: 0;
   background-color: white;
   color: black;
+<<<<<<< HEAD
+>>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
+=======
 >>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
 }
 #mega-footer .widget a {
@@ -8397,6 +8739,7 @@ body.sticky .ie8 #footers {
 #mega-footer .widget.widget_sp_image {
   padding: 0;
   border: none;
+<<<<<<< HEAD
   background-color: transparent;
 }
 #mega-footer .widget.widget_metaslider_widget {
@@ -8405,6 +8748,13 @@ body.sticky .ie8 #footers {
 <<<<<<< HEAD
   color: #333;
 =======
+>>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
+=======
+  background-color: transparent;
+}
+#mega-footer .widget.widget_metaslider_widget {
+  padding: 0;
+  background-color: transparent;
 >>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
   border: none;
 }