Index: modules/extra_voting_forms/extra_voting_forms.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/extra_voting_forms/extra_voting_forms.module,v
retrieving revision 1.1.2.13
diff -u -r1.1.2.13 extra_voting_forms.module
--- extra_voting_forms.module	1 Jul 2008 18:52:16 -0000	1.1.2.13
+++ extra_voting_forms.module	13 Aug 2008 17:25:04 -0000
@@ -69,7 +69,13 @@
     // Create the $css_file_complete variable
     $css_file = 'extra_voting_forms_all.css';
     $widget_dir = variable_get('extra_voting_forms_widget_dir', 'default');
-    $css_file_complete = drupal_get_path('module', 'extra_voting_forms') .'/widgets/'. $widget_dir .'/'. $css_file;
+    $widget_dir_themes = variable_get('extra_voting_forms_widget_dir_in_themes', FALSE);
+    if ($widget_dir_themes===FALSE) {
+    	$css_file_complete = drupal_get_path('module', 'extra_voting_forms') .'/widgets/'. $widget_dir .'/'. $css_file;
+    }
+    else {
+    	$css_file_complete =  path_to_theme() .'/widgets/'. $widget_dir .'/'. $css_file;
+    }
 
     // Add the css - the user-specified one if there is one, or the
     // module's
@@ -117,7 +123,14 @@
  */
 function extra_voting_forms_admin_settings() {
 
-  $form['extra_voting_forms_widget_dir'] = array(
+  $form['extra_voting_forms_widget_dir_sections'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Directory for Widgets'),
+    '#collapsible' => FALSE,
+    '#collapsed' => FALSE
+  );
+
+  $form['extra_voting_forms_widget_dir_sections']['extra_voting_forms_widget_dir'] = array(
     '#type' => 'textfield', 
     '#title' => t('Widget directory'),
     '#description' => t('The directory that defines the voting system\'s widgets'), 
@@ -126,6 +139,12 @@
     '#required' => FALSE,
     '#default_value' =>variable_get('extra_voting_forms_widget_dir', 'default') 
   );
+  
+  $form['extra_voting_forms_widget_dir_sections']['extra_voting_forms_widget_dir_in_themes'] = array(
+	  '#type' => 'checkbox', 
+	  '#title' => t('Widgets are located in the current theme directory'),
+	  '#default_value' => variable_get('extra_voting_forms_widget_dir_in_themes', FALSE), 
+ 	);
 
   $form['extra_voting_forms_node_types_applied'] = array(
     '#type' => 'checkboxes',
Index: modules/extra_voting_forms/extra_voting_forms.install
===================================================================
RCS file: /cvs/drupal/contributions/modules/extra_voting_forms/extra_voting_forms.install,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 extra_voting_forms.install
--- extra_voting_forms.install	21 Apr 2008 20:47:55 -0000	1.1.2.1
+++ extra_voting_forms.install	13 Aug 2008 17:02:46 -0000
@@ -22,6 +22,7 @@
  */
 function extra_voting_forms_uninstall() {
   variable_del('extra_voting_forms_widget_dir');
+	variable_del('extra_voting_forms_widget_dir_in_themes');
   variable_del('extra_voting_forms_node_types_applied');
   variable_del('extra_voting_forms_allow_karma_for_comments');
   variable_del('extra_voting_forms_anonymous_url');